Okay, so I screwed up the conflict resolution in our integration tree. Nothing to worry about here, as long as whoever does the merge/backmerge with the real trees doesn't do the same mistake.
BR, Jani. On Fri, 19 Feb 2016, kbuild test robot <[email protected]> wrote: > tree: git://anongit.freedesktop.org/drm-intel drm-intel-nightly > head: e7d04bf9d65001191a0b64e322bffa713280d132 > commit: a77c4b431c465402d508e1c53a55ab9a11c2471f [2/7] Merge remote-tracking > branch 'drm-upstream/drm-next' into drm-intel-nightly > config: i386-allmodconfig (attached as .config) > reproduce: > git checkout a77c4b431c465402d508e1c53a55ab9a11c2471f > # save the attached .config to linux build tree > make ARCH=i386 > > All errors (new ones prefixed by >>): > >>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:818:6: error: redefinition of >>> 'amdgpu_ttm_tt_affect_userptr' > bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, > ^ > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:799:6: note: previous definition > of 'amdgpu_ttm_tt_affect_userptr' was here > bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, > ^ > > vim +/amdgpu_ttm_tt_affect_userptr +818 > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > > d7006964 Christian König 2016-02-08 812 if (gtt->userptr > end || > gtt->userptr + size <= start) > d7006964 Christian König 2016-02-08 813 return false; > d7006964 Christian König 2016-02-08 814 > d7006964 Christian König 2016-02-08 815 return true; > d38ceaf9 Alex Deucher 2015-04-20 816 } > d38ceaf9 Alex Deucher 2015-04-20 817 > cc1de6e8 Christian König 2016-02-08 @818 bool > amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, > cc1de6e8 Christian König 2016-02-08 819 > unsigned long end) > cc1de6e8 Christian König 2016-02-08 820 { > cc1de6e8 Christian König 2016-02-08 821 struct amdgpu_ttm_tt *gtt = > (void *)ttm; > > :::::: The code at line 818 was first introduced by commit > :::::: cc1de6e800c253172334f8774c419dc64401cd2e drm/amdgpu: fix issue with > overlapping userptrs > > :::::: TO: Christian König <[email protected]> > :::::: CC: Alex Deucher <[email protected]> > > --- > 0-DAY kernel test infrastructure Open Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
