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: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Andrei Pistirica <andrei.pistirica@microchip.com>,
	Ralf Baechle <ralf@linux-mips.org>,
	Vladimir Murzin <vladimir.murzin@arm.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree
Date: Fri, 20 May 2016 20:26:47 -0700	[thread overview]
Message-ID: <20160521032647.GA6509@kroah.com> (raw)
In-Reply-To: <20160520123151.0c8a7c47@canb.auug.org.au>

On Fri, May 20, 2016 at 12:31:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   include/uapi/linux/serial_core.h
> 
> between commits:
> 
>   157b9394709e ("serial: pic32_uart: Add PIC32 UART driver")
>   07b75260ebc2 ("Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus")
> 
> from Linus' tree and commit:
> 
>   041f031def33 ("serial: mps2-uart: add MPS2 UART driver")
> 
> from the tty tree.
> 
> I fixed it up (see below) 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 for this, I've warned Linus to watch out for this when he merges
my tree into his.

greg k-h

  reply	other threads:[~2016-05-21  3:26 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-20  2:31 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2016-05-21  3:26 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-10  3:40 Stephen Rothwell
2020-03-10  9:04 ` Greg KH
2020-03-10 10:52   ` Jiri Slaby
2020-03-16  6:38   ` Jiri Slaby
2020-03-16  7:46     ` Greg KH
2020-03-16  6:34 ` Jiri Slaby
2014-05-05  5:41 Stephen Rothwell
2014-05-05 21:02 ` Greg KH
2013-01-21  3:46 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` Greg KH
2013-01-17  2:04 Stephen Rothwell
2013-01-18  0:41 ` Greg KH
2011-10-25  8:18 Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2011-10-25  8:12 Stephen Rothwell
2011-10-25 12:02 ` Greg KH
2011-02-24  5:34 Stephen Rothwell
2011-02-24 19:39 ` Greg KH
2011-02-25  5:11   ` Stephen Rothwell
2011-02-25  5:48     ` 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=20160521032647.GA6509@kroah.com \
    --to=greg@kroah.com \
    --cc=andrei.pistirica@microchip.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ralf@linux-mips.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    --cc=vladimir.murzin@arm.com \
    /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).