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
Date: Mon, 6 May 2024 11:28:10 +1000 [thread overview]
Message-ID: <20240506112810.02ae6c17@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]
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)/../
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-05-06 1:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 1:28 Stephen Rothwell [this message]
2024-05-15 23:22 ` linux-next: manual merge of the net-next tree with the kbuild tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-04-26 0:26 Stephen Rothwell
2019-08-16 2:41 Stephen Rothwell
2019-08-16 5:21 ` Andrii Nakryiko
2019-08-16 6:01 ` Stephen Rothwell
2019-08-16 12:39 ` Stephen Rothwell
2019-08-16 18:03 ` Kees Cook
2017-04-26 1:09 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240506112810.02ae6c17@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).