From: Johannes Berg <johannes@sipsolutions.net>
To: Jakub Kicinski <kuba@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Paolo Abeni <pabeni@redhat.com>, Kalle Valo <kvalo@kernel.org>,
Networking <netdev@vger.kernel.org>,
Wireless <linux-wireless@vger.kernel.org>,
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 net-next tree with the wireless tree
Date: Fri, 20 Oct 2023 07:49:27 +0200 [thread overview]
Message-ID: <007e30c2fe785e2f3fd7ffae9b85b7903f46e48c.camel@sipsolutions.net> (raw)
In-Reply-To: <20231019144004.0f5b2533@kernel.org>
On Thu, 2023-10-19 at 14:40 -0700, Jakub Kicinski wrote:
> On Thu, 12 Oct 2023 10:10:10 +0200 Johannes Berg wrote:
> > > I fixed it up (I just used the latter, there may be more needed)
> >
> > Just using net-next/wireless-next is fine, I actually noticed the issue
> > while I was merging the trees to fix the previous conflicts here.
>
> Resolved the conflict in 041c3466f39d, could you double check?
I don't see anything there, but I guess that means it's good? Code looks
fine.
> Also, there's another direct return without freeing the key in
> ieee80211_key_link(), is that one okay ?
*sigh*
No, it's not. I think that means I resolved the previous merge there
incorrectly, because it's OK in wireless and broken in wireless-next,
and it had been fixed in d097ae01ebd4 ("wifi: mac80211: fix potential
key leak").
Anyway, thanks for checking and noticing! Will fix.
johannes
next prev parent reply other threads:[~2023-10-20 5:49 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 0:37 linux-next: manual merge of the net-next tree with the wireless tree Stephen Rothwell
2023-10-12 8:10 ` Johannes Berg
2023-10-19 21:40 ` Jakub Kicinski
2023-10-20 5:49 ` Johannes Berg [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-24 0:24 Stephen Rothwell
2014-07-24 2:47 Stephen Rothwell
2014-07-24 2:47 ` Stephen Rothwell
2014-07-23 2:00 Stephen Rothwell
2014-07-23 2:00 ` Stephen Rothwell
2014-05-23 3:45 Stephen Rothwell
2014-05-23 3:45 ` Stephen Rothwell
2014-02-26 3:21 Stephen Rothwell
2014-02-26 3:21 ` Stephen Rothwell
2014-02-21 2:34 Stephen Rothwell
2014-02-21 2:34 ` Stephen Rothwell
2013-09-27 3:03 Stephen Rothwell
2013-09-27 3:03 ` Stephen Rothwell
2013-08-27 4:10 Stephen Rothwell
2013-08-27 4:10 ` Stephen Rothwell
2013-04-04 0:44 Stephen Rothwell
2013-04-04 0:44 ` Stephen Rothwell
2013-05-02 3:19 ` Stephen Rothwell
2013-05-02 3:19 ` Stephen Rothwell
2013-04-02 2:00 Stephen Rothwell
2013-04-02 2:00 ` Stephen Rothwell
2013-04-02 9:30 ` Samuel Ortiz
2013-03-26 0:51 Stephen Rothwell
2013-03-26 0:51 ` Stephen Rothwell
2013-03-26 0:48 Stephen Rothwell
2013-03-26 0:48 ` Stephen Rothwell
2012-07-03 1:44 Stephen Rothwell
2012-07-03 1:44 ` Stephen Rothwell
2012-07-03 2:33 ` John W. Linville
2012-06-14 3:12 Stephen Rothwell
2012-06-14 3:12 ` Stephen Rothwell
2012-06-14 4:50 ` Mohammed Shafi Shajakhan
2012-06-14 4:50 ` Mohammed Shafi Shajakhan
2012-06-14 12:59 ` John W. Linville
2012-05-04 3:21 Stephen Rothwell
2012-05-04 3:21 ` Stephen Rothwell
2012-05-04 4:35 ` Guy, Wey-Yi
2012-02-16 1:40 Stephen Rothwell
2012-02-16 1:40 ` Stephen Rothwell
2012-02-16 1:37 Stephen Rothwell
2012-02-16 1:37 ` Stephen Rothwell
2011-12-20 2:02 Stephen Rothwell
2011-12-20 2:02 ` Stephen Rothwell
2011-12-15 2:53 Stephen Rothwell
2011-12-15 2:53 ` Stephen Rothwell
2011-12-15 3:16 ` Stephen Rothwell
2011-12-15 3:16 ` 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=007e30c2fe785e2f3fd7ffae9b85b7903f46e48c.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.