Linux-Wireless Archive mirror
 help / color / mirror / Atom feed

From: Johannes Berg <johannes@sipsolutions.net>
To: 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>
Subject: Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Date: Tue, 26 Mar 2024 08:58:36 +0100	[thread overview]
Message-ID: <49041c649349a3b252118f9bb26521e5d47c82b1.camel@sipsolutions.net> (raw)
In-Reply-To: <20240326100945.765b8caf@canb.auug.org.au>

Hi Stephen,

Thanks for the heads-up.

> between commit:
> 
>   5f4040050553 ("wifi: iwlwifi: mvm: disable MLO for the time being")
> 
> from the wireless tree and commit:
> 
>   bbd6d0f8bc51 ("wifi: iwlwifi: mvm: advertise IEEE80211_HW_HANDLES_QUIET_CSA")
> 
> from the wireless-next tree.

I kind of knew this was going to happen (given how the patches applied
or rather didn't), but nothing to prevent it yet. I think we'll get it
fixed in due time, before all the -next stuff goes anywhere.

Thanks,
johannes

next prev parent reply	other threads:[~2024-03-26  7:58 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-25 23:09 linux-next: manual merge of the wireless-next tree with the wireless tree Stephen Rothwell
2024-03-26  7:58 ` Johannes Berg [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-31  2:44 Stephen Rothwell
2024-04-22  0:56 Stephen Rothwell
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

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=49041c649349a3b252118f9bb26521e5d47c82b1.camel@sipsolutions.net \
    --to=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=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

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).