Received-SPF: pass (google.com: domain of linux-kernel+bounces-205752-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <317b515f-30fb-4b18-bb99-b65091449ec4@bootlin.com>
Date: Fri, 7 Jun 2024 11:44:10 +0200
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: manual merge of the wireless-next tree with the
 wireless tree
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>
References: <20240603110023.23572803@canb.auug.org.au>
 <875xuquyyb.fsf@kernel.org> <87tti6qt5o.fsf@kernel.org>
From: =?UTF-8?Q?Alexis_Lothor=C3=A9?= <alexis.lothore@bootlin.com>
Content-Language: en-US
In-Reply-To: <87tti6qt5o.fsf@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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