From patchwork Mon Jun 3 01:01:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13683161 X-Patchwork-Delegate: kvalo@adurom.com Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 928B010E6; Mon, 3 Jun 2024 01:01:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717376482; cv=none; b=jQY9JzdrCOp/qY2El5NInTBgSKnZSEyTBZc1nyZfvprpRQEbA3rMSwZ+YsAx3bwrEyLew0Y7RofZH1+Pa9kCgrrkHMl+l0x2AcWnzEna5YROY5j4aK8qUBo8/nImySTZCtNuVRU1shpHPbTWpp7rUfcEnnwvuPx1SWzJntZk4P8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717376482; c=relaxed/simple; bh=WsxmSnVOfFkU7amu/IfJK6x2Dv1B0lj8Xc7qDr+yCgY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=Rw3/YaV/kzSpSvMszqNsAyoK8HekcIcuaHR1y1lAnc1zT5xcZ4SXQEKPAHIE0SgI0SP2Z1++kc6aOWsh8wZT3iraKmxN4SI9BT1iy8Q5mBy3I5moIQKzg+ck13TCCq5YiUh07DFlbfrLjgb5zfYRC4VbDUbL3QBg5iFbXrd0F2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=tWYufJXx; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="tWYufJXx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1717376476; bh=mw8hyXSE9bFJ4MtVqvHaxGbgI57D2tjW39scQTVUe4I=; h=Date:From:To:Cc:Subject:From; b=tWYufJXxbRDZVSOCxft3qnO2eCpy2mpoyD0JSR/Wr8cbM+o9FWJV1M8rsJFnlY8h2 VGZdfi32jpPQUteH1MDesU+o8iMAt48vHB0jzKErNtYfrRithA3O3emQfNoaES7MQo LFsJIQdKsLaLZ+slMtqSmUngk8jKJNxe36pvU9/77qRXYq29/2GZlDcEgvUu2yOHW3 4rY/YTjqw7R4xHd1jbilHZ1BQ3pIcSlwZyJCxwuewNKV/J5B9lEJwAMgluwMO7m+wO uz8IKI4F+mdlXUf+UbFLkUvSZFESvANBCwtkJ8MKKiyEzUThqnilr7olzDCuoBBl/B MVGujOHVX3R5Q== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4VswQd00Gmz4wc8; Mon, 3 Jun 2024 11:01:12 +1000 (AEST) Date: Mon, 3 Jun 2024 11:01:12 +1000 From: Stephen Rothwell To: Kalle Valo , Johannes Berg , Wireless Cc: Alexis =?utf-8?q?Lothor=C3=A9?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the wireless-next tree with the wireless tree Message-ID: <20240603110023.23572803@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. diff --cc drivers/net/wireless/microchip/wilc1000/netdev.c index 710e29bea560,4e2698528a49..000000000000 --- a/drivers/net/wireless/microchip/wilc1000/netdev.c