From: Kalle Valo <kvalo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Johannes Berg <johannes@sipsolutions.net>,
Wireless <linux-wireless@vger.kernel.org>,
Felix Fietkau <nbd@nbd.name>,
Johannes Berg <johannes.berg@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>,
Networking <netdev@vger.kernel.org>,
Jakub Kicinski <kuba@kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Date: Mon, 03 Apr 2023 11:43:31 +0300 [thread overview]
Message-ID: <87iledbbkc.fsf@kernel.org> (raw)
In-Reply-To: <20230403122313.6006576b@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 3 Apr 2023 12:23:13 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> On Fri, 31 Mar 2023 10:49:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the wireless-next tree got a conflict in:
>>
>> net/mac80211/rx.c
>>
>> between commit:
>>
>> a16fc38315f2 ("wifi: mac80211: fix potential null pointer dereference")
>>
>> from the wireless tree and commit:
>>
>> fe4a6d2db3ba ("wifi: mac80211: implement support for yet another mesh A-MSDU format")
>>
>> from the wireless-next tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
[...]
> This is now a conflict between the net-next and net trees.
My plan is to submit wireless-next pull request to net-next by
Wednesday, that should fix the conflict.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2023-04-03 8:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 23:49 linux-next: manual merge of the wireless-next tree with the wireless tree Stephen Rothwell
2023-03-31 9:17 ` Johannes Berg
2023-04-03 2:23 ` Stephen Rothwell
2023-04-03 8:43 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-09-12 2:46 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-26 2:20 Stephen Rothwell
2024-02-08 23:56 Stephen Rothwell
2024-02-09 7:03 ` Johannes Berg
2024-03-25 23:09 Stephen Rothwell
2024-03-26 7:58 ` Johannes Berg
2024-04-22 0:56 Stephen Rothwell
2024-05-31 2:44 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
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=87iledbbkc.fsf@kernel.org \
--to=kvalo@kernel.org \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=ryder.lee@mediatek.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).