lkml.org 
[lkml]   [2021]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-09-17 02:58    [W:0.031 / U:0.608 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site