linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Larry Finger <Larry.Finger@lwfinger.net>,
	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 staging.current tree
Date: Wed, 22 Sep 2021 08:48:29 +0200	[thread overview]
Message-ID: <YUrRvX4y+xir7hUH@kroah.com> (raw)
In-Reply-To: <20210922124530.50a4750b@canb.auug.org.au>

On Wed, Sep 22, 2021 at 12:45:30PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/r8188eu/os_dep/ioctl_linux.c
> 
> between commit:
> 
>   aa3233ea7bdb ("staging: r8188eu: fix -Wrestrict warnings")
> 
> from the staging.current tree and commit:
> 
>   7bdedfef085b ("staging: r8188eu: Remove mp, a.k.a. manufacturing process, code")
> 
> from the staging tree.
> 
> I fixed it up (the latter removed the code updated by the former, so I
> did that) and can carry the fix as necessary. This is now fixed as far as
> linux-next is concerned, but any non trivial conflicts should be mentioned
> to your upstream maintainer when your tree is submitted for merging.
> You may also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.

Thanks, I'll resolve this when merging the branches together :)

greg k-h

  reply	other threads:[~2021-09-22  6:48 UTC|newest]

Thread overview: 80+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-22  2:45 linux-next: manual merge of the staging tree with the staging.current tree Stephen Rothwell
2021-09-22  6:48 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-19  3:56 Stephen Rothwell
2022-06-14  2:24 Stephen Rothwell
2022-06-14  6:42 ` Greg KH
2022-06-20  7:00 ` Greg KH
2020-04-24  5:15 Stephen Rothwell
2020-04-24  6:45 ` Greg KH
2020-04-28 12:15   ` Greg KH
2020-04-28 12:55     ` Stephen Rothwell
2019-12-13  1:05 Stephen Rothwell
2019-12-14 12:19 ` Greg KH
2019-04-08  3:02 Stephen Rothwell
2019-04-08  8:14 ` Jonathan Cameron
2019-04-08 10:01   ` Andy Shevchenko
2019-04-08 10:14     ` Jonathan Cameron
2019-04-08 10:34       ` Andy Shevchenko
2019-04-08 12:01         ` Jonathan Cameron
2019-04-09 15:39           ` Andy Shevchenko
2019-04-10  6:34             ` Alexandru Ardelean
2017-12-04  1:50 Stephen Rothwell
2017-12-04  9:09 ` Greg KH
2017-12-04 10:00   ` Jonathan Cameron
2017-12-06 14:50 ` Greg KH
2017-07-19  3:07 Stephen Rothwell
2017-07-19  6:07 ` Greg KH
2017-07-19  8:30   ` Marcus Wolf
2017-07-20  8:19     ` Greg KH
2017-01-30  3:59 Stephen Rothwell
2016-06-14  5:04 Stephen Rothwell
2016-06-19 20:17 ` Jonathan Cameron
2016-04-27  4:54 Stephen Rothwell
2016-04-27 12:37 ` Jonathan Cameron
2016-04-05  3:03 Stephen Rothwell
2016-04-05  4:41 ` Greg KH
2016-02-01  3:45 Stephen Rothwell
2016-02-01  4:01 ` Greg KH
2014-05-01  4:37 Stephen Rothwell
2014-05-01  4:47 ` Greg KH
2014-04-17  4:31 Stephen Rothwell
2014-04-17 16:17 ` Greg KH
2014-03-06  5:06 Stephen Rothwell
2014-03-06  5:11 ` Greg KH
2014-03-17 18:29 ` Greg KH
2013-12-04  2:06 Stephen Rothwell
2013-11-27  2:01 Stephen Rothwell
2013-11-27  3:20 ` Greg KH
2013-09-23  3:21 Stephen Rothwell
2013-09-23  5:52 ` Jonathan Cameron
2013-09-23  3:16 Stephen Rothwell
2013-09-23  5:54 ` Jonathan Cameron
2012-10-25  2:19 Stephen Rothwell
2012-10-25 12:42 ` Ian Abbott
2011-06-09  6:58 Stephen Rothwell
2011-06-09 18:41 ` Greg KH
2011-06-09 20:51   ` Greg KH
2011-06-09  6:58 Stephen Rothwell
2011-06-09 18:42 ` Greg KH
2011-06-09 20:51   ` Greg KH
2011-06-28 14:07     ` Arjan Mels
2011-06-28 14:43       ` Greg KH
2011-04-06  4:41 Stephen Rothwell
2011-04-06  5:12 ` Greg KH
2011-02-10  5:35 Stephen Rothwell
2011-02-10 11:24 ` Nitin Gupta
2011-02-10 14:43 ` Robert Jennings
2011-02-10 18:50 ` Greg KH
2011-02-18 20:13 ` Greg KH
2011-01-31  5:16 Stephen Rothwell
2011-01-31 18:47 ` Greg KH
2011-02-02 21:58 ` Greg KH
2011-01-31  5:09 Stephen Rothwell
2011-01-31  8:52 ` Arend van Spriel
2011-02-02 21:58 ` Greg KH
2010-12-02  2:22 Stephen Rothwell
2010-12-02  3:20 ` Randy Dunlap
2010-12-02  4:00 ` Greg KH
2010-12-08 22:27   ` Greg KH
2010-11-10  2:24 Stephen Rothwell
2010-11-10 18:40 ` Greg KH

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=YUrRvX4y+xir7hUH@kroah.com \
    --to=greg@kroah.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.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).