All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Okash Khawaja <okash.khawaja@gmail.com>,
	Alan Cox <alan@llwyncelyn.cymru>
Subject: Re: linux-next: manual merge of the staging tree with the tty tree
Date: Mon, 5 Jun 2017 08:50:03 +0200	[thread overview]
Message-ID: <20170605065003.GG14680@kroah.com> (raw)
In-Reply-To: <20170605145749.4d6df5cd@canb.auug.org.au>

On Mon, Jun 05, 2017 at 02:57:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   include/uapi/linux/tty.h
> 
> between commit:
> 
>   8a8dabf2dd68 ("tty: handle the case where we cannot restore a line discipline")
> 
> from the tty tree and commit:
> 
>   1ab92da32e37 ("staging: speakup: add tty-based comms functions")
> 
> from the staging tree.
> 
> I fixed it up (I used the tty tree version) 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.

I'm the maintainer of both, I knew this would happen and made it so it
was obvious what version to take :)

thanks,

greg k-h

  reply	other threads:[~2017-06-05  6:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-05  4:57 linux-next: manual merge of the staging tree with the tty tree Stephen Rothwell
2017-06-05  6:50 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-04  6:33 Stephen Rothwell
2022-10-04  8:26 ` Greg KH
2016-02-01  3:51 Stephen Rothwell
2016-02-01  4:01 ` Greg KH
2012-11-29  4:47 Stephen Rothwell
2012-11-29  5:17 ` Greg KH
2012-11-28  5:14 Stephen Rothwell
2012-11-28 16:47 ` Greg KH
2012-09-17  7:37 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
2012-09-13  6:14 Stephen Rothwell
2012-09-13  6:59 ` Samuel Iglesias Gonsálvez
2012-09-13  7:36   ` Stephen Rothwell
2012-05-07  5:58 Stephen Rothwell
2012-05-07 14: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=20170605065003.GG14680@kroah.com \
    --to=greg@kroah.com \
    --cc=alan@llwyncelyn.cymru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=okash.khawaja@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.