From: "Alexis Lothoré" <alexis.lothore@bootlin•com>
To: Kalle Valo <kvalo@kernel•org>, Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Johannes Berg <johannes@sipsolutions•net>,
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 wireless-next tree with the wireless tree
Date: Fri, 7 Jun 2024 11:44:10 +0200 [thread overview]
Message-ID: <317b515f-30fb-4b18-bb99-b65091449ec4@bootlin.com> (raw)
In-Reply-To: <87tti6qt5o.fsf@kernel.org>
Hello Kalle, Stephen,
On 6/6/24 12:09, Kalle Valo wrote:
> Kalle Valo <kvalo@kernel•org> writes:
>
>> Stephen Rothwell <sfr@canb•auug.org.au> writes:
>>
>>> Hi all,
>>>
>>> Today's linux-next merge of the wireless-next tree got a conflict in:
>>>
>>> drivers/net/wireless/microchip/wilc1000/netdev.c
>>>
>>> between commit:
>>>
>>> ebfb5e8fc8b4 ("Revert "wifi: wilc1000: convert list management to RCU"")
>>>
>>> from the wireless tree and commit:
>>>
>>> 6fe46d5c0a84 ("wifi: wilc1000: set net device registration as last
>>> step during interface creation")
>>>
>>> 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.
>>
>> Thanks. We need to figure out how we solve this conflict, most probably
>> we'll ask network maintainers to fix it when they pull wireless-next.
>
> Alexis, you know wilc1000 the best. Could you double check the conflict
> resolution, it somewhat complicated:>
> https://lore.kernel.org/all/20240603110023.23572803@canb.auug.org.au/
>
LGTM, and some quick testing on the linux-next tree with the corresponding merge
commit showed no issue (no RCU warning, and mac address loading fix behaving
properly)
Alexis
--
Alexis Lothoré, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2024-06-07 9:44 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 1:01 linux-next: manual merge of the wireless-next tree with the wireless tree Stephen Rothwell
2024-06-03 10:01 ` Kalle Valo
2024-06-06 10:09 ` Kalle Valo
2024-06-07 9:44 ` Alexis Lothoré [this message]
2024-06-07 10:29 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2025-07-16 3:52 Stephen Rothwell
2025-07-16 8:59 ` Johannes Berg
2025-07-16 11:54 ` Stephen Rothwell
2025-07-16 17:18 ` Jeff Johnson
2024-10-28 1:36 Stephen Rothwell
2024-10-28 6:51 ` Johannes Berg
2024-10-31 2:20 ` Stephen Rothwell
2024-10-24 0:55 Stephen Rothwell
2024-10-24 6:58 ` Johannes Berg
2024-10-31 2:24 ` Stephen Rothwell
2024-05-31 2:44 Stephen Rothwell
2024-04-22 0:56 Stephen Rothwell
2024-03-25 23:09 Stephen Rothwell
2024-03-26 7:58 ` Johannes Berg
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
2014-11-25 3:36 Stephen Rothwell
2013-12-03 0:20 Stephen Rothwell
2013-12-03 15:52 ` John W. Linville
2013-12-03 16:09 ` Johannes Berg
2013-12-03 18:12 ` Bob Copeland
2013-12-04 1:21 ` Yeoh Chun-Yeow
2013-08-19 2:41 Stephen Rothwell
2013-08-12 1:53 Stephen Rothwell
2013-08-12 15:15 ` John W. Linville
2013-08-12 15:34 ` Berg, Johannes
2013-06-07 2:56 Stephen Rothwell
2013-06-07 6:21 ` Sujith Manoharan
2013-03-26 1:18 Stephen Rothwell
2013-03-12 1:00 Stephen Rothwell
2012-11-15 2:17 Stephen Rothwell
2012-11-15 8:06 ` Arend van Spriel
2012-10-22 0:46 Stephen Rothwell
2012-10-22 0:13 Stephen Rothwell
2011-11-14 0:53 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=317b515f-30fb-4b18-bb99-b65091449ec4@bootlin.com \
--to=alexis.lothore@bootlin$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--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 \
--cc=sfr@canb$(echo .)auug.org.au \
/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