Received-SPF: pass (google.com: domain of linux-kernel+bounces-180483-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 16 May 2024 09:22:28 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>, Networking <netdev@vger.kernel.org>,
 Johannes Berg <johannes.berg@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Miri Korenblit
 <miriam.rachel.korenblit@intel.com>
Subject: Re: linux-next: manual merge of the net-next tree with the kbuild
 tree
Message-ID: <20240516092228.485bbd9b@canb.auug.org.au>
In-Reply-To: <20240506112810.02ae6c17@canb.auug.org.au>
References: <20240506112810.02ae6c17@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/AhHSsggpw0kU4Mga+WYew2F";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/AhHSsggpw0kU4Mga+WYew2F
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 6 May 2024 11:28:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Hi all,
>=20
> Today's linux-next merge of the net-next tree got a conflict in:
>=20
>   drivers/net/wireless/intel/iwlwifi/mvm/Makefile
>=20
> between commit:
>=20
>   7c972986689b ("kbuild: use $(src) instead of $(srctree)/$(src) for sour=
ce directory")
>=20
> from the kbuild tree and commit:
>=20
>   2887af4d22f9 ("wifi: iwlwifi: mvm: implement link grading")
>=20
> from the net-next tree.
>=20
> I fixed it up (see below) 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc drivers/net/wireless/intel/iwlwifi/mvm/Makefile
> index 764ba73cde1e,5c754b87ea20..000000000000
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
> @@@ -15,4 -16,4 +16,4 @@@ iwlmvm-$(CONFIG_IWLWIFI_LEDS) +=3D led.
>   iwlmvm-$(CONFIG_PM) +=3D d3.o
>   iwlmvm-$(CONFIG_IWLMEI) +=3D vendor-cmd.o
>  =20
> - ccflags-y +=3D -I $(src)/../
>  -subdir-ccflags-y +=3D -I $(srctree)/$(src)/../
> ++subdir-ccflags-y +=3D -I $(src)/../

This is now a conflict between the kbuild tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/AhHSsggpw0kU4Mga+WYew2F
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZFQ7QACgkQAVBC80lX
0GwCLQf/SD2RL7WHWmYpOgmJlZKYIGQjpRCg7q99HXgIfjQ0KRu9dNzkJDC0HCOf
wQnlcXsxn/w2ESo77AMpB71lSqxT5jHdhQSiDCxSd6pAu0ORgvi8tW7IWKl8kD+H
arXtcpXm11jBPf4S3Xb/JF1A5eQTjYrr3EgB1I5lM1nBArx2QigCAhIgpoqCbSuc
dUsOI+LD+KCuxehW94TFHkcJjJ1Tdc6jz8Io0Oq5ADt3Tj/w3mh5kEGZvRC2Nx8y
lWl6eBy9QRARBaf2bQ1rv+PYen06T87NHk+WTnROqN4sHdPjTsh30k9phjL5B43u
LShT2vFKXW5uIJ7gOb+V8X1KTw7EsQ==
=Qsan
-----END PGP SIGNATURE-----

--Sig_/AhHSsggpw0kU4Mga+WYew2F--