From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B785C432BE for ; Mon, 9 Aug 2021 07:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 178FE61055 for ; Mon, 9 Aug 2021 07:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233671AbhHIHzd (ORCPT ); Mon, 9 Aug 2021 03:55:33 -0400 Received: from gimli.rothwell.id.au ([103.230.158.156]:38301 "EHLO gimli.rothwell.id.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233550AbhHIHzc (ORCPT ); Mon, 9 Aug 2021 03:55:32 -0400 Received: from authenticated.rothwell.id.au (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.rothwell.id.au (Postfix) with ESMTPSA id 4GjpK46W8xzyXZ; Mon, 9 Aug 2021 17:55:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothwell.id.au; s=201702; t=1628495706; bh=Ax7yStg3wWAtuh2tZBdEAtQJchvZ6pdPo94W58ORdIY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=FWPgSATxjInAWqoMSEq7J5Jj/y64wp2eAHlw64ch+LJiz1l5aejqnAT566lNvjpPR xROf5KSJJb8ygt0lmDlHPN8/SwusqC2FS1jfnoKsj3s56D73X/MO+WzmIR4axIOi2i e3oJoobMFXYg+Ir7vNwLyHLHDXBILburbDN3uGI5CoULKDuq6EOvL73HZTx/K7pLuj dZ+fu/Ac4G6uhCKFIwAC9gFPA2GvayEYeY7hllXbsd5NSyik5gmnDt0rppw8bgMwIq FJP1GZHrQFLxQ5nzCxh2cp9RGT/48IYDTYi962zV4XkuvUuBowd1aFg0CdOa/VzHXG VdYB9nxAKWRew== Date: Mon, 9 Aug 2021 17:55:02 +1000 From: Stephen Rothwell To: Arnd Bergmann Cc: Phillip Potter , Mark Brown , Greg KH , "David S . Miller" , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the staging tree with the net-next tree Message-ID: <20210809175502.226ce4cd@elm.ozlabs.ibm.com> In-Reply-To: References: <20210802233339.25285-1-broonie@kernel.org> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/2.RNl=5PYs033Lo8A0nkNzX"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/2.RNl=5PYs033Lo8A0nkNzX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 3 Aug 2021 11:23:29 +0200 Arnd Bergmann wrote: > > On Tue, Aug 3, 2021 at 10:57 AM Phillip Potter wr= ote: > > On Tue, 3 Aug 2021 at 00:33, Mark Brown wrote: > > > > Thank you for your e-mail - not sure what is going on here as the > > r8188eu files are totally new - the net-next commit is touching files > > from a different directory (rtl8188eu) so perhaps it is getting > > confused and considering it a rename or similar? Regardless, all > > commits for r8188eu subdirectory should come from staging, as it is a > > different driver. =20 >=20 > In net-next, the .ndo_do_ioctl() callback behaves differently, as it no > longer gets called from user space. If you have any > SIOCDEVPRIVATE ioctls in the driver, those need to be > moved over to the new .ndo_siocdevprivate callback, while any > nonstandard ioctl commands outside of that range can just be > removed. So, can that be done in the staging tree as it is, or does Greg need to merge (part of) the net-next tree? Or will someone just supply me with a reasonable merge resolution patch? Or does Greg reset the staging tree to 5c872e1d2595 and try again next time? Or similar for Dave (revert Arnd's work)? Currently it is a mess in linux-next and probably will not work even though it does build. --=20 Cheers, Stephen Rothwell --Sig_/2.RNl=5PYs033Lo8A0nkNzX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEQ31YACgkQAVBC80lX 0GxbZwf/WZEoB2hfI0N7PW8yTIZDQh2G06KzRBebc6GQGX5hRJCReF7XwXVfs8sD sKoL231BaSOQKn1+HJ5b6oqwyiU1pLUEsQ2qIryQ3Bh3ZMBs+/AyRArvztU0id8D UZ1jqcnd/g29OhmuCzsZR2TfvvW1A1EiQOfHU7hnDyOnmLVIcFmREWyMLDuiVhhK Pkg3+LMtcqZnGksqzVv1M5VYzGjMVgMz/mT7Lyuqik/wg8N6O+E1n79K+LA3JATh 823R6tYX/uhH2JILrztYQz+YkqM5uWa0kbfR01HWbqeaAPcnmPQ72gM7gHX6yDZd QLSWIGqPB41OenIkYbTf4Q41k31/hA== =MvfM -----END PGP SIGNATURE----- --Sig_/2.RNl=5PYs033Lo8A0nkNzX--