From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel•com>,
Johannes Berg <johannes@sipsolutions•net>
Cc: Johannes Berg <johannes.berg@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the iwlwifi-next tree with Linus' tree
Date: Tue, 6 May 2025 11:44:02 +1000 [thread overview]
Message-ID: <20250506114402.2f440664@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
Hi all,
Today's linux-next merge of the iwlwifi-next tree got conflicts in:
drivers/net/wireless/intel/iwlwifi/cfg/sc.c
drivers/net/wireless/intel/iwlwifi/iwl-config.h
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/intel/iwlwifi/iwl-trans.c
drivers/net/wireless/intel/iwlwifi/iwl-trans.h
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
between various commits from Linus' tree and various commits from the
iwlwifi-next tree.
At least one of the commits in Linus' tree is duplicated in the
iwlwifi-next tree.
I couldn't figure out how to fix it up, so I dropped the iwlwifi tree
for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-06 1:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 1:44 Stephen Rothwell [this message]
2025-05-06 6:26 ` linux-next: manual merge of the iwlwifi-next tree with Linus' tree Johannes Berg
2025-05-07 1:10 ` Stephen Rothwell
2025-05-07 5:37 ` Johannes Berg
2025-05-08 3:24 ` Stephen Rothwell
2025-05-14 2:41 ` Stephen Rothwell
2025-05-14 2:55 ` Stephen Rothwell
2025-05-14 6:41 ` Johannes Berg
2025-05-14 7:36 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-08 3:48 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=20250506114402.2f440664@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=johannes.berg@intel$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miriam.rachel.korenblit@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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