From: Johannes Berg <johannes@sipsolutions•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Miriam Rachel Korenblit <miriam.rachel.korenblit@intel•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree
Date: Tue, 06 May 2025 08:26:31 +0200 [thread overview]
Message-ID: <f53576b21774ab6ba8294c5d1954f0528764f2fb.camel@sipsolutions.net> (raw)
In-Reply-To: <20250506114402.2f440664@canb.auug.org.au>
Hi Stephen,
> 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.
Yeah, no surprise, there were some reverts in this area. The good thing
is that we also already fixed the bugs that necessitated the reverts
differently, so (eventually, need to check how much is in there now)
this will just be "take next".
> At least one of the commits in Linus' tree is duplicated in the
> iwlwifi-next tree.
Right, saw your other mail too, we'll see what happened and drop those.
Thanks!
johannes
next prev parent reply other threads:[~2025-05-06 6:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 1:44 linux-next: manual merge of the iwlwifi-next tree with Linus' tree Stephen Rothwell
2025-05-06 6:26 ` Johannes Berg [this message]
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=f53576b21774ab6ba8294c5d1954f0528764f2fb.camel@sipsolutions.net \
--to=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 \
--cc=sfr@canb$(echo .)auug.org.au \
/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