From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jakub Kicinski <kuba@kernel•org>
Cc: Johannes Berg <johannes.berg@intel•com>,
Kalle Valo <kvalo@kernel•org>,
Johannes Berg <johannes@sipsolutions•net>,
Wireless <linux-wireless@vger•kernel.org>,
David Miller <davem@davemloft•net>,
Ilan Peer <ilan.peer@intel•com>,
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 wireless-next tree with Linus' tree
Date: Thu, 20 Oct 2022 04:14:40 +1100 [thread overview]
Message-ID: <20221020041440.3f6c1e46@canb.auug.org.au> (raw)
In-Reply-To: <20221019162324.2baaa7e8@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]
Hi Jakub,
On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <kuba@kernel•org> wrote:
>
> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
> > Today's linux-next merge of the wireless-next tree got a conflict in:
> >
> > net/mac80211/util.c
> >
> > between commit:
> >
> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
> >
> > from the origin tree and commit:
> >
> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
This should have been commit
45ebac4f059b ("wifi: mac80211: Parse station profile from association response")
> Dunno if this is a glitch or real problem. But it reminds me - I see
> there is direct wireless -> wireless-next merge without going via
> Linus's tree. I think you may have mentioned it to us, but not sure
> if I said this clearly - let's try to avoid such merges. Linus certainly
> doesn't like when we do net -> net-next merges without sending net to
> him first and forwarding. I'm not 100% sure why (maybe Steven knows)
> - whether it's an aesthetic thing or avoiding real issues thing, but
> either way it's _a_ thing :S
Has Linus really complained about you merging the net tree into the
net-next tree? The only reason that would be a problem is if (as
happened only once that I remember) Linus rejects the net tree merge
due to some problem. So, yes, wait until after the net (or wireless)
tree has been merged by Linus, but then there should be no reason to
not just merge the net tree (rather than Linus' tree).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-10-19 23:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 16:23 linux-next: manual merge of the wireless-next tree with Linus' tree Stephen Rothwell
2022-10-19 23:23 ` Jakub Kicinski
2022-10-19 17:14 ` Stephen Rothwell [this message]
2022-10-19 23:52 ` Jakub Kicinski
2022-10-26 12:40 ` Kalle Valo
2022-10-26 14:35 ` Kalle Valo
2022-10-26 14:50 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2024-10-09 0:44 Stephen Rothwell
2024-10-09 6:43 ` Greg Kroah-Hartman
2024-10-09 6:51 ` Johannes Berg
2024-10-09 7:13 ` Greg Kroah-Hartman
2024-10-09 7:19 ` Johannes Berg
2024-10-09 7:27 ` Greg Kroah-Hartman
2024-10-09 8:30 ` Johannes Berg
2024-10-09 9:24 ` Greg Kroah-Hartman
2024-10-09 0:38 Stephen Rothwell
2023-09-26 1:54 Stephen Rothwell
2023-09-26 4:50 ` Greg Kroah-Hartman
2023-09-14 0:28 Stephen Rothwell
2013-07-25 1:37 Stephen Rothwell
2013-01-23 1:16 Stephen Rothwell
2013-01-23 20:18 ` Grumbach, Emmanuel
2011-11-22 3:20 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=20221020041440.3f6c1e46@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=ilan.peer@intel$(echo .)com \
--cc=johannes.berg@intel$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=kvalo@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
/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