netdev - linux-next: manual merge of the net-next tree with the kbuild tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240506112810.02ae6c17@canb.auug.org.au>
Date: Mon, 6 May 2024 11:28:10 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Masahiro Yamada <masahiroy@...nel.org>
Cc: Networking <netdev@...r.kernel.org>, Johannes Berg
 <johannes.berg@...el.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Miri Korenblit
 <miriam.rachel.korenblit@...el.com>
Subject: linux-next: manual merge of the net-next tree with the kbuild tree

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.

-- 
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) += led.
  iwlmvm-$(CONFIG_PM) += d3.o
  iwlmvm-$(CONFIG_IWLMEI) += vendor-cmd.o
  
- ccflags-y += -I $(src)/../
 -subdir-ccflags-y += -I $(srctree)/$(src)/../
++subdir-ccflags-y += -I $(src)/../

Content of type "application/pgp-signature" skipped