Messages in this thread | | | Subject | Re: linux-next: build failure after merge of the drm-misc tree | From | Christian König <> | Date | Fri, 30 Oct 2020 08:53:26 +0100 |
| |
Am 30.10.20 um 01:07 schrieb Stephen Rothwell: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/nouveau/nouveau_ttm.c: In function 'nouveau_ttm_init': > drivers/gpu/drm/nouveau/nouveau_ttm.c:320:19: error: implicit declaration of function 'swiotlb_nr_tbl' [-Werror=implicit-function-declaration] > 320 | need_swiotlb = !!swiotlb_nr_tbl(); > | ^~~~~~~~~~~~~~
Mhm, thanks for the note. Looks like there is some merge conflict to me.
In my tree there is an "#if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)" around that line making sure the function is available.
Going to take a look later today.
Christian.
> Caused by commit > > ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2") > > I have used the drm-misc tree from next-20201029 for today. >
| |