Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1657267 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-06-05 07:00 +0200 |
| Last post | 2017-06-05 09:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the staging tree with the tty tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-05 07:00 +0200
Re: linux-next: manual merge of the staging tree with the tty tree Greg KH <greg@kroah.com> - 2017-06-05 09:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-06-05 07:00 +0200 |
| Subject | linux-next: manual merge of the staging tree with the tty tree |
| Message-ID | <tOShs-6GX-3@gated-at.bofh.it> |
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.
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2017-06-05 09:00 +0200 |
| Message-ID | <tOU9z-7TO-3@gated-at.bofh.it> |
| In reply to | #1657267 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web