Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 24 Jul 2023 11:14:39 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>
Cc:     Alex Deucher <alexander.deucher@amd.com>,
        Azeem Shaikh <azeemshaikh38@gmail.com>,
        Kees Cook <keescook@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mario Limonciello <mario.limonciello@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Message-ID: <20230724111439.572dc274@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/sH0=iM1FqtxAIdANAVmW=Ms";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/sH0=iM1FqtxAIdANAVmW=Ms
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  drivers/gpu/drm/amd/amdgpu/atom.c

between commit:

  992b8fe106ab ("drm/radeon: Replace all non-returning strlcpy with strscpy=
")

from Linus' tree and commit:

  adf64e214280 ("drm/amd: Avoid reading the VBIOS part number twice")

from the amdgpu tree.

I fixed it up (the latter removed the line updates by the former, so I
just used the latter) 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
Cheers,
Stephen Rothwell

--Sig_/sH0=iM1FqtxAIdANAVmW=Ms
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmS90H8ACgkQAVBC80lX
0GxM1wf/XLdl4hKitJtv2dj6XaBUCAGjV3XA3nimtUShbdu6EUsci2mCIBVIPmiJ
pGViVk11DRbVp9ozTv9KRaukjWODu3CBfyQAzqDtK/9CBv1LXuwMAVirAznkaJ+s
qHEbqUUYdlbm0Vmz3dLe73ZVhD8efsZqlroLC7EXPGNUPBEoSu0BXhr6qF9lVxeS
vkVl+v39J9YSk6jA2+T0uuv1nPKDAsN7GLZ+6O48/+oXoL7OFN8N3jui0TyAzJqe
lDeXfjIBRH4J+lR7OAHKBc45sVfE7kBO7yuFz0mAkUs9c1N+m1zJ+pq4N0tBwjBH
qww2btwR7mgoKSV5qwLGEyIWT+Gsvg==
=qYcI
-----END PGP SIGNATURE-----

--Sig_/sH0=iM1FqtxAIdANAVmW=Ms--