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;
MIME-Version: 1.0
References: <20210802233339.25285-1-broonie@kernel.org> <CAA=Fs0k95E3FN-9rwzSQcK4JmejHDKBbvk-yhRynJBTbqBNVxQ@mail.gmail.com>
In-Reply-To: <CAA=Fs0k95E3FN-9rwzSQcK4JmejHDKBbvk-yhRynJBTbqBNVxQ@mail.gmail.com>
From:   Arnd Bergmann <arnd@arndb.de>
Date:   Tue, 3 Aug 2021 11:23:29 +0200
Message-ID: <CAK8P3a0HWO1tPwCkhasRE1iXt+-rC72nAzsUuO6jb4XasGAAPg@mail.gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the net-next tree
To:     Phillip Potter <phil@philpotter.co.uk>
Cc:     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>,
        Arnd Bergmann <arnd@arndb.de>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Aug 3, 2021 at 10:57 AM Phillip Potter <phil@philpotter.co.uk> wrote:
> 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.

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.

       Arnd