linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Potter <phil@philpotter.co.uk>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@rothwell.id.au>,
	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
Date: Mon, 9 Aug 2021 22:45:55 +0100	[thread overview]
Message-ID: <CAA=Fs0nJDKheZA99+c-BWjpZCFrC=U4_-O2Hgxv2cg9hRGgDxA@mail.gmail.com> (raw)
In-Reply-To: <CAK8P3a0WRMNmBmBDerZ0nWPdFZKALnxrj-uUFBkTP-MOtv48vg@mail.gmail.com>

On Mon, 9 Aug 2021 at 21:00, Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Mon, Aug 9, 2021 at 2:48 PM Phillip Potter <phil@philpotter.co.uk> wrote:
> > On Mon, 9 Aug 2021 at 08:55, Stephen Rothwell <sfr@rothwell.id.au> wrote:
> > > On Tue, 3 Aug 2021 11:23:29 +0200 Arnd Bergmann <arnd@arndb.de> 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

Sounds good. I will put something together to take out rtw_ioctl in
that case, and submit through Greg/linux-staging. Many thanks.

Regards,
Phil

  reply	other threads:[~2021-08-09 21:46 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-02 23:33 linux-next: manual merge of the staging tree with the net-next tree Mark Brown
2021-08-03  8:57 ` Phillip Potter
2021-08-03  9:23   ` Arnd Bergmann
2021-08-09  7:55     ` Stephen Rothwell
2021-08-09 12:46       ` Phillip Potter
2021-08-09 20:00         ` Arnd Bergmann
2021-08-09 21:45           ` Phillip Potter [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-23  3:47 Stephen Rothwell
2023-10-23  7:27 ` Greg KH
2019-02-28  4:52 Stephen Rothwell
2019-02-28  7:04 ` Greg KH
2018-03-15  7:35 Stephen Rothwell
2016-12-07  4:04 Stephen Rothwell
2016-12-07  7:02 ` Greg KH
2016-11-24  3:42 Stephen Rothwell
2016-10-21  1:21 Stephen Rothwell
2014-07-16  6:43 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-05-28  8:28 Stephen Rothwell
2014-05-28 15:49 ` Greg KH
2014-03-27  5:09 Stephen Rothwell
2014-03-27 19:14 ` Eric W. Biederman
2014-03-17  8:08 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2013-05-29  4:14 Stephen Rothwell
2013-05-29  8:03 ` Greg KH
2013-01-23  4:45 Stephen Rothwell
2013-01-23  4:52 ` Greg KH
2011-10-25  8:26 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAA=Fs0nJDKheZA99+c-BWjpZCFrC=U4_-O2Hgxv2cg9hRGgDxA@mail.gmail.com' \
    --to=phil@philpotter.co.uk \
    --cc=arnd@arndb.de \
    --cc=broonie@kernel.org \
    --cc=davem@davemloft.net \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@rothwell.id.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).