Received-SPF: pass (google.com: domain of linux-kernel+bounces-198947-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Kalle Valo <kvalo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Johannes Berg <johannes@sipsolutions.net>,  Wireless
 <linux-wireless@vger.kernel.org>,  Alexis =?utf-8?Q?Lothor=C3=A9?=
 <alexis.lothore@bootlin.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 the
 wireless tree
References: <20240603110023.23572803@canb.auug.org.au>
Date: Mon, 03 Jun 2024 13:01:48 +0300
In-Reply-To: <20240603110023.23572803@canb.auug.org.au> (Stephen Rothwell's
	message of "Mon, 3 Jun 2024 11:01:12 +1000")
Message-ID: <875xuquyyb.fsf@kernel.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain

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.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches