public inbox for linux-next@vger.kernel.org
 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 Linus' and the wireless trees
Date: Wed, 12 Mar 2025 09:11:33 +0100	[thread overview]
Message-ID: <529ce0c963118af305287c6c28bf146f62af5366.camel@sipsolutions.net> (raw)
In-Reply-To: <20250312135306.2cd270b3@canb.auug.org.au>

Hi,

> Today's linux-next merge of the wireless-next tree got a conflict in:
> 
>   net/wireless/nl80211.c
> 
> between commits:
> 
>   1f860eb4cdda ("wifi: nl80211: disable multi-link reconfiguration")
> 
> from Linus' tree and
> 
>   2e85829ac7fb ("wifi: nl80211: fix assoc link handling")
> 
> from the wireless tree and commits:
> 
>   a096a8602f4f ("wifi: cfg80211: move link reconfig parameters into a struct")
>   969241371f06 ("wifi: cfg80211: allow setting extended MLD capa/ops")
> 
> from the wireless-next tree.

Thanks for the heads-up, I'll see how we can deal with it best.

> I fixed it up (see below and I used the latter for the later hunk)

That looks good, thanks.


Unrelated to this, but I see you've CC'ed Kalle. He no longer maintains
wireless, so if you have some list of people for trees or so you should
probably remove him.

Thanks,
johannes

      reply	other threads:[~2025-03-12  8:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-12  2:53 linux-next: manual merge of the wireless-next tree with Linus' and the wireless trees Stephen Rothwell
2025-03-12  8:11 ` Johannes Berg [this message]

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=529ce0c963118af305287c6c28bf146f62af5366.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
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