linux-kernel - linux-next: build failure after merge of the amdgpu tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20210917105756.5dadb04f@canb.auug.org.au>
Date:   Fri, 17 Sep 2021 10:57:56 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Deucher <alexdeucher@...il.com>,
        Daniel Vetter <daniel.vetter@...ll.ch>
Cc:     Andrey Grodzovsky <andrey.grodzovsky@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>
Subject: linux-next: build failure after merge of the amdgpu tree

Hi all,

After merging the amdgpu tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from include/drm/ttm/ttm_bo_driver.h:40,
                 from include/drm/drm_gem_ttm_helper.h:11,
                 from drivers/gpu/drm/drm_gem_ttm_helper.c:5:
include/drm/ttm/ttm_device.h:274:19: error: duplicate member 'pinned'
  274 |  struct list_head pinned;
      |                   ^~~~~~

Caused by commit

  59084e464297 ("drm/ttm: Create pinned list")

interacting with commit

  32eadf52d449 ("drm/ttm: Create pinned list")

from the drm-misc tree.

The automatic merge proved incorrect, so I have removed one of the
insertions.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped