Received-SPF: pass (google.com: domain of linux-kernel+bounces-169228-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Mon, 6 May 2024 11:28:10 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>, Masahiro Yamada <masahiroy@kernel.org>
Cc: 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: linux-next: manual merge of the net-next tree with the kbuild tree
Message-ID: <20240506112810.02ae6c17@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/g+ZxHzBaV8rjNyuPr1nq.DW";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/g+ZxHzBaV8rjNyuPr1nq.DW
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/mvm/Makefile

between commit:

  7c972986689b ("kbuild: use $(src) instead of $(srctree)/$(src) for source=
 directory")

from the kbuild tree and commit:

  2887af4d22f9 ("wifi: iwlwifi: mvm: implement link grading")

from the net-next tree.

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
Cheers,
Stephen Rothwell

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)/../

--Sig_/g+ZxHzBaV8rjNyuPr1nq.DW
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY4MioACgkQAVBC80lX
0Gxu7gf9H2jdre2Zs2XXQL03YpWEMJx14nF1wh+CoGnYQnIzLjTvgnT/G6MwJlE6
34zRIMUPbVTPZzkyZpIn29U26Xo0gH89O69UO/wvLenX+7t4I2P8BkMPr/gtLa4W
AqZT75UCIQFfa2dzpduiMwQSSIfpyQAq8TpvYPiEdxCq+QBkxySnAo39kSpSGi6U
Gd9XHm+oGZKw3738oUR3FUaS03xaRpfGYEqzd6bXq5Ny7FlQBIwiT333+2hM2u28
BHYDO/SsLRFWgv1Kz0TnxbGXQZjLGe91Lu4pSmaoFiVMvAzW1NKN5p2Uz3IUGaO3
ezoq+Kyb0V1yI1o/AXvVYLRMRxDhSg==
=lTLJ
-----END PGP SIGNATURE-----

--Sig_/g+ZxHzBaV8rjNyuPr1nq.DW--