Re: linux-next: manual merge of the staging tree with the net-next tree

[Arnd Bergmann]

On Mon, Aug 9, 2021 at 2:48 PM Phillip Potter <phil@xxxxxxxxxxxxxxxx> wrote:
> On Mon, 9 Aug 2021 at 08:55, Stephen Rothwell <sfr@xxxxxxxxxxxxxx> wrote:
> > On Tue, 3 Aug 2021 11:23:29 +0200 Arnd Bergmann <arnd@xxxxxxxx> wrote:
> >
> > 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.
> >
>
> Happy to try and provide a merge resolution patch if that is easier?
> Will be this evening UK time though.

Most likely there is no user space that actually wants this function at all,
so I think the easiest way would be to remove all of rtw_ioctl in the
staging tree version of this driver.

        Arnd