From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the drm tree Date: Thu, 10 Oct 2019 11:22:49 +1100 Message-ID: <20191010112249.720989aa@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0233907250==" Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Airlie , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List List-Id: dri-devel@lists.freedesktop.org --===============0233907250== Content-Type: multipart/signed; boundary="Sig_/lIT/TpjrrNf6nF9Pwa/PMRX"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/lIT/TpjrrNf6nF9Pwa/PMRX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/i915/i915_vma.h:35, from drivers/gpu/drm/i915/gt/uc/intel_guc.h:17, from drivers/gpu/drm/i915/gt/uc/intel_uc.h:9, from drivers/gpu/drm/i915/gt/intel_gt_types.h:16, from drivers/gpu/drm/i915/i915_drv.h:81, from drivers/gpu/drm/i915/i915_getparam.c:7: drivers/gpu/drm/i915/gem/i915_gem_object.h:174:1: error: redefinition of 'i= 915_gem_object_never_bind_ggtt' 174 | i915_gem_object_never_bind_ggtt(const struct drm_i915_gem_object *o= bj) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/gem/i915_gem_object.h:168:1: note: previous definition= of 'i915_gem_object_never_bind_ggtt' was here 168 | i915_gem_object_never_bind_ggtt(const struct drm_i915_gem_object *o= bj) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Caused by the automatic merge of commit 3a1fea6d2353 ("drm/i915/userptr: Never allow userptr into the mappable GG= TT") from the drm-intel-fixes tree and commits a4311745bba9 ("drm/i915/userptr: Never allow userptr into the mappable GG= TT") 3cbad5d77749 ("drm/i915/gem: Refactor tests on obj->ops->flags") from the drm tree. I fixed it up by removing the extra definition. This sort of thing will keep happening as longs as bugs are fixed in your development trees and then cherry-picked back into your -fixes trees. This practise also causes quite a few unnecessary conflicts that each have to be checked and merged by hand. --=20 Cheers, Stephen Rothwell --Sig_/lIT/TpjrrNf6nF9Pwa/PMRX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl2eedkACgkQAVBC80lX 0GyOYgf/f4qvlGy3OVWVxHDAOJjjxnAAWRG3u5oxfmagSZsi3NjqV9aGPzQXJk0P YoPfZv35qqfSSTB3Ao9XTUbij2nI5/76mq7oPp/0/43MLyeun+/pPQlyZ4sPp7qi eddvMCPvRfF6PjH2R12zeopTsT6HtXp5Gfo2E+tLxGrxjWEKQbq8HZFsZEnN3sZx T88Nu7zJ4grx8043pf8ZqVAMTQmKkaNHtZC33ZPNKsiFSt2UzyNxiD8ukKnkm1st 6iVAcfe3Mw/ZVWIQHt2z8KWMPrBzhZo7LXoJtD2bem1LlP0bLC9E4WmQWIjzvWcu IfMKQdFmfnpWffH5pe/C5OPucH10ng== =3MwN -----END PGP SIGNATURE----- --Sig_/lIT/TpjrrNf6nF9Pwa/PMRX-- --===============0233907250== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============0233907250==--