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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 9 Aug 2021 13:46:55 +0100
From:   Phillip Potter <phil@...lpotter.co.uk>
To:     Stephen Rothwell <sfr@...hwell.id.au>
Cc:     Arnd Bergmann <arnd@...db.de>, Mark Brown <broonie@...nel.org>,
        Greg KH <greg@...ah.com>,
        "David S . Miller" <davem@...emloft.net>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the net-next tree

On Mon, 9 Aug 2021 at 08:55, Stephen Rothwell <sfr@...hwell.id.au> wrote:
>
> Hi all,
>
> On Tue, 3 Aug 2021 11:23:29 +0200 Arnd Bergmann <arnd@...db.de> wrote:
> >
> > On Tue, Aug 3, 2021 at 10:57 AM Phillip Potter <phil@...lpotter.co.uk> wrote:
> > > On Tue, 3 Aug 2021 at 00:33, Mark Brown <broonie@...nel.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.
> >
> > 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.
>
> --
> Cheers,
> Stephen Rothwell

Dear Stephen,

Happy to try and provide a merge resolution patch if that is easier?
Will be this evening UK time though.

Regards,
Phil