Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 9 Aug 2021 17:55:02 +1000
From:   Stephen Rothwell <sfr@rothwell.id.au>
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Phillip Potter <phil@philpotter.co.uk>,
        Mark Brown <broonie@kernel.org>, Greg KH <greg@kroah.com>,
        "David S . Miller" <davem@davemloft.net>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        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 staging tree with the net-next
 tree
Message-ID: <20210809175502.226ce4cd@elm.ozlabs.ibm.com>
In-Reply-To: <CAK8P3a0HWO1tPwCkhasRE1iXt+-rC72nAzsUuO6jb4XasGAAPg@mail.gmail.com>
References: <20210802233339.25285-1-broonie@kernel.org>
        <CAA=Fs0k95E3FN-9rwzSQcK4JmejHDKBbvk-yhRynJBTbqBNVxQ@mail.gmail.com>
        <CAK8P3a0HWO1tPwCkhasRE1iXt+-rC72nAzsUuO6jb4XasGAAPg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/2.RNl=5PYs033Lo8A0nkNzX";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--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 <arnd@arndb.de> wrote:
>
> On Tue, Aug 3, 2021 at 10:57 AM Phillip Potter <phil@philpotter.co.uk> wr=
ote:
> > On Tue, 3 Aug 2021 at 00:33, Mark Brown <broonie@kernel.org> 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--