From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7CCF15B122; Fri, 7 Jun 2024 09:44:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.193 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717753456; cv=none; b=M0ivTEHfnGcNKHsqSzYSUOck07MiYB8b+DYbLq1wPSygzYvev3nM2k5Evbu1ejXzoiIr6DTzWMTVt5bLIWO9KlQjCzRBai9CR35BTyTK9iydLt3OxHWRN7t9to0UzFM2uTuGvT+vgvQbMXHa2fdwf6KOT2gpa0BUxVfdDtRTvPI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717753456; c=relaxed/simple; bh=2mT2I/1Q77Tiqay8xStHbcCX37B0aHQ26qx1zUhRLnY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=LgrswDZbigoTsKEpFxat7wpEGLBDKDDR9p84aM3lJCkYWX2pjKzG4TVTY7KTabUoDhBS4lHFD9ZyLcpEIOdf3mp8djDOi3y4OGr22/7j+HXoMmPevouYsP5DpMC1eRPAVQ09TfFy7y4q8RgwbBo65pdn/gzIz6Bk8nmarOfWhIk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=OaLd97R7; arc=none smtp.client-ip=217.70.183.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="OaLd97R7" Received: by mail.gandi.net (Postfix) with ESMTPSA id 0CAE1240005; Fri, 7 Jun 2024 09:44:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1717753452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4yyx5zM1CvYIUAqANuHPAr8M/UeGqJG8eIhKlHzJByE=; b=OaLd97R7bAj+5dDAGZ0DA7B5AI83++gIwTNxZ35ji2PxPmQ+uy0ZIRhrQPSfG0iU/dIpDN c55Y8dpJ/CrvVILOQjB2ESfubylzjQROq0hiP13wCK4NnMfOqht6FmDslMtpCdJ1ZNxsYb y+sdrORNm8kemd2gjnPCrImy5Kj9H+0pbiLn5Do//h8QVHnOHw+HHJSjPoxi6ZaZMSucXL 0HnZuv+vfhIxp1Z2NIwnDHkN0OgfRgdZvl1AbpQXEt0pVgOzpPxYkJ3F1PkDgCDzL2exFF 1E+jbHmm97apf7REVsGzXv+ypf6N0oibjJdUlTmrsmok0n8IbmoLRcFApjPuWQ== Message-ID: <317b515f-30fb-4b18-bb99-b65091449ec4@bootlin.com> Date: Fri, 7 Jun 2024 11:44:10 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 , Stephen Rothwell Cc: Johannes Berg , Wireless , Linux Kernel Mailing List , Linux Next Mailing List References: <20240603110023.23572803@canb.auug.org.au> <875xuquyyb.fsf@kernel.org> <87tti6qt5o.fsf@kernel.org> From: =?UTF-8?Q?Alexis_Lothor=C3=A9?= Content-Language: en-US In-Reply-To: <87tti6qt5o.fsf@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Sasl: alexis.lothore@bootlin.com Hello Kalle, Stephen, On 6/6/24 12:09, Kalle Valo wrote: > Kalle Valo writes: > >> Stephen Rothwell 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