dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	DRI <dri-devel@lists.freedesktop.org>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>
Subject: linux-next: build failure after merge of the amdgpu tree
Date: Fri, 17 Sep 2021 10:57:56 +1000	[thread overview]
Message-ID: <20210917105756.5dadb04f@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 727 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2021-09-17  0:58 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-17  0:57 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-19  1:56 linux-next: build failure after merge of the amdgpu tree Stephen Rothwell
     [not found] <20231010124357.5251e100@canb.auug.org.au>
2023-10-19  1:06 ` Stephen Rothwell
2023-10-24  0:59   ` Stephen Rothwell
2023-10-24 12:57     ` Alex Deucher
2023-10-24 19:52       ` Alex Deucher
2023-10-24 21:47       ` Stephen Rothwell
2023-05-19  0:06 Stephen Rothwell
2023-05-19  3:10 ` James Zhu
2023-05-19 13:38 ` Alex Deucher
     [not found] <20220307111342.105ce204@canb.auug.org.au>
     [not found] ` <YiYC2fQgf7d/QPSM@sirena.org.uk>
2022-03-08 11:15   ` Noralf Trønnes
2021-12-03  1:11 Stephen Rothwell
2021-07-28 12:34 Mark Brown
2021-02-05  2:12 Stephen Rothwell
     [not found] <20200612102552.2d573ebb@canb.auug.org.au>
2020-06-26  1:47 ` Stephen Rothwell
     [not found] <20190626212212.25b41df4@canb.auug.org.au>
2019-06-27  3:35 ` Stephen Rothwell
2019-06-27 14:18   ` Alex Deucher
2019-06-27 22:01     ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210917105756.5dadb04f@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alexdeucher@gmail.com \
    --cc=andrey.grodzovsky@amd.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox