From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7DB1EE7717F for ; Mon, 16 Dec 2024 07:38:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 24D2A10E04B; Mon, 16 Dec 2024 07:38:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="kowms/jC"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C94C10E04B; Mon, 16 Dec 2024 07:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1734334678; bh=PEF23WBTRSX30Go9xsIxa6zHb86us2+G8Fu8OSIamtc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=kowms/jCFZab0fainZ/zIAHpRa7jKD99n/kOJYgNRQ2YxKd1DY41S6Drwxzr1Kvs8 6M0hmTT8g0HvacMJpZz7d6asqiVGKFdhfHLRK3eyqwt1Yf4hOMSi3cYIn2ojeNyxHT UUM934RsJp+qiKiUiZCXJaCZBoxAKB8NwOfG32A2EVCTM3kRTswQWMqkQqQBDRPu7G df+0e59E0hHaUBhtxnN4OGt804e3GtSqXYF0Uswb8tg0afF1Y5Kc+pz32pK7k5jJ9C WO5jZnPA9zdg0TIypUIfUX4U7YAbm15z6qPgcnHhFniPk+MTR20vzCA5E3TBxfc1d5 9flBfLS4iQXRg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4YBWxw6X8qz4wbR; Mon, 16 Dec 2024 18:37:56 +1100 (AEDT) Date: Mon, 16 Dec 2024 18:38:01 +1100 From: Stephen Rothwell To: Dave Airlie Cc: Lucas De Marchi , Thomas =?UTF-8?B?SGVsbHN0?= =?UTF-8?B?csO2bQ==?= , DRM XE List , Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List , Matt Atwood , Matt Roper , DRI Subject: Re: linux-next: manual merge of the drm-xe tree with Linus' tree Message-ID: <20241216183801.0d5c9a5f@canb.auug.org.au> In-Reply-To: <20241125120921.1bbc1930@canb.auug.org.au> References: <20241125120921.1bbc1930@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/NA/Bjt+4/BxwIyxa..6/nHa"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" --Sig_/NA/Bjt+4/BxwIyxa..6/nHa Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell = wrote: > > Today's linux-next merge of the drm-xe tree got a conflict in: >=20 > include/drm/intel/xe_pciids.h >=20 > between commit: >=20 > 493454445c95 ("drm/xe: switch to common PCI ID macros") >=20 > from Linus' tree and commit: >=20 > ae78ec0a52c4 ("drm/xe/ptl: Add another PTL PCI ID") >=20 > from the drm-xe tree. >=20 > I fixed it up (I deleted the file and added the following merge fix patch) > and can carry the fix as necessary. This is now fixed as far as linux-next > is concerned, but any non trivial conflicts should be mentioned to your > upstream maintainer when your tree is submitted for merging. You may > also want to consider cooperating with the maintainer of the conflicting > tree to minimise any particularly complex conflicts. >=20 > From: Stephen Rothwell > Date: Mon, 25 Nov 2024 12:05:38 +1100 > Subject: [PATCH] fix up for "drm/xe/ptl: Add another PTL PCI ID" >=20 > interacting with "drm/xe: switch to common PCI ID macros" from Linus' > tree. > --- > include/drm/intel/pciids.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h > index 32480b5563db..7883384acd5e 100644 > --- a/include/drm/intel/pciids.h > +++ b/include/drm/intel/pciids.h > @@ -829,6 +829,7 @@ > MACRO__(0xB092, ## __VA_ARGS__), \ > MACRO__(0xB0A0, ## __VA_ARGS__), \ > MACRO__(0xB0A1, ## __VA_ARGS__), \ > - MACRO__(0xB0A2, ## __VA_ARGS__) > + MACRO__(0xB0A2, ## __VA_ARGS__), \ > + MACRO__(0xB0B0, ## __VA_ARGS__) > =20 > #endif /* __PCIIDS_H__ */ > --=20 > 2.45.2 OK, so commits ae78ec0a52c4 and 493454445c95 were merged in commit 8f109f287fdc ("Merge drm/drm-next into drm-xe-next") but include/drm/intel/xe_pciids.h was not deleted (it is not longer referenced anywhere in the tree) and the above patch was not applied :-( Since then that part of the drm-xe tree has been merged into the drm tree in commit bdecb30d579e ("Merge tag 'drm-xe-next-2024-12-11' of https://gitlab.freed= esktop.org/drm/xe/kernel into drm-next") So, include/drm/intel/xe_pciids.h needs to be removed from the drm tree and the above patch applied there. --=20 Cheers, Stephen Rothwell --Sig_/NA/Bjt+4/BxwIyxa..6/nHa Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmdf2NkACgkQAVBC80lX 0GzplAgAgw4CMAtlaLzaeAQv3P1EKOnP3bx0Sm1mgZ0IZVU7b82lGj1hpBMwVJoP WtSLNoE4i7B1GKaTJmvF6FnpO2jd8kcQ+GfccXs4D/JxieaYEqjMtpds62zodZnL jhwXF1hIqoXiYb3oZc/2SIl9RCDuTF+xnucytUqdE/nI+38DuRHXXHZkVvZR9b18 aoiVXIGFymyPecDupYEhO/VkFuwCT8tscVGbdwhuiDTg3HwwONhR6MEBD4RcYbWh 01kQMTJRbsbuFa1FjP5agLUuMKw+SdM1pJg2YGjltaUz9pmVoMoWknDi8bGgad31 6B8jUJpxF1kUbSgE+no1pbzpGuhOWA== =d+hl -----END PGP SIGNATURE----- --Sig_/NA/Bjt+4/BxwIyxa..6/nHa--