From: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
To: Johannes Berg <johannes@sipsolutions.net>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Kalle Valo <kvalo@kernel.org>
Cc: Wireless <linux-wireless@vger.kernel.org>,
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>,
Pagadala Yesu Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>
Subject: Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Date: Wed, 16 Jul 2025 10:18:20 -0700 [thread overview]
Message-ID: <3dc23475-1c16-435b-9c6d-d2d7996280c4@oss.qualcomm.com> (raw)
In-Reply-To: <4ee6758a49e6f01c5e42b2f7c27aff905ac07dfa.camel@sipsolutions.net>
On 7/16/2025 1:59 AM, Johannes Berg wrote:
> On Wed, 2025-07-16 at 13:52 +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the wireless-next tree got conflicts in:
>>
>> drivers/net/wireless/intel/iwlwifi/fw/regulatory.c
>> drivers/net/wireless/intel/iwlwifi/mld/regulatory.c
>>
>> between commit:
>>
>> 5fde0fcbd760 ("wifi: iwlwifi: mask reserved bits in chan_state_active_bitmap")
>>
>> from the wireless tree and commit:
>>
>> ea045a0de3b9 ("wifi: iwlwifi: add support for accepting raw DSM tables by firmware")
>>
>> from the wireless-next tree.
>>
>
> Thanks for the heads-up.
>
> I'll double-check, and give Jakub a heads-up, he's probably going to hit
> this, unless I defer the wireless-next pull request. We'll figure it
> out.
I'm planning on sending an ath PR for the 6.17 merge window early next week,
so I hope there will still be one more wireless-next PR.
/jeff
next prev parent reply other threads:[~2025-07-16 17:18 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 3:52 Stephen Rothwell
2025-07-16 8:59 ` Johannes Berg
2025-07-16 11:54 ` Stephen Rothwell
2025-07-16 17:18 ` Jeff Johnson [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-09-15 14:20 Mark Brown
2026-09-09 12:12 Mark Brown
2024-10-28 1:36 Stephen Rothwell
2024-10-28 6:51 ` Johannes Berg
2024-10-31 2:20 ` Stephen Rothwell
2024-10-24 0:55 Stephen Rothwell
2024-10-24 6:58 ` Johannes Berg
2024-10-31 2:24 ` Stephen Rothwell
2024-06-03 1:01 Stephen Rothwell
2024-06-03 10:01 ` Kalle Valo
2024-06-06 10:09 ` Kalle Valo
2024-06-07 9:44 ` Alexis Lothoré
2024-06-07 10:29 ` Kalle Valo
2024-05-31 2:44 Stephen Rothwell
2024-04-22 0:56 Stephen Rothwell
2024-03-25 23:09 Stephen Rothwell
2024-03-26 7:58 ` Johannes Berg
2024-02-08 23:56 Stephen Rothwell
2024-02-09 7:03 ` Johannes Berg
2023-09-26 2:20 Stephen Rothwell
2023-09-26 2:02 Stephen Rothwell
2023-09-26 2:41 ` Stephen Rothwell
2023-09-26 6:21 ` Johannes Berg
2023-09-12 2:46 Stephen Rothwell
2023-03-30 23:49 Stephen Rothwell
2023-03-31 9:17 ` Johannes Berg
2023-04-03 2:23 ` Stephen Rothwell
2023-04-03 8:43 ` Kalle Valo
2014-11-25 3:36 Stephen Rothwell
2013-12-03 0:20 Stephen Rothwell
2013-12-03 15:52 ` John W. Linville
2013-12-03 16:09 ` Johannes Berg
2013-12-03 18:12 ` Bob Copeland
2013-12-04 1:21 ` Yeoh Chun-Yeow
2013-08-19 2:41 Stephen Rothwell
2013-08-12 1:53 Stephen Rothwell
2013-08-12 15:15 ` John W. Linville
2013-08-12 15:34 ` Berg, Johannes
2013-06-07 2:56 Stephen Rothwell
2013-06-07 6:21 ` Sujith Manoharan
2013-03-26 1:18 Stephen Rothwell
2013-03-12 1:00 Stephen Rothwell
2012-11-15 2:17 Stephen Rothwell
2012-11-15 8:06 ` Arend van Spriel
2012-10-22 0:46 Stephen Rothwell
2012-10-22 0:13 Stephen Rothwell
2011-11-14 0:53 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=3dc23475-1c16-435b-9c6d-d2d7996280c4@oss.qualcomm.com \
--to=jeff.johnson@oss.qualcomm.com \
--cc=johannes@sipsolutions.net \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=pagadala.yesu.anjaneyulu@intel.com \
--cc=sfr@canb.auug.org.au \
/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
all inboxes | Powered by JetHome®