Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1722179 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-08-29 08:40 +0200 |
| Last post | 2017-08-29 09:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the tty tree with the parisc-hd tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-29 08:40 +0200
Re: linux-next: manual merge of the tty tree with the parisc-hd tree Greg KH <greg@kroah.com> - 2017-08-29 09:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-08-29 08:40 +0200 |
| Subject | linux-next: manual merge of the tty tree with the parisc-hd tree |
| Message-ID | <ujIlR-7yN-17@gated-at.bofh.it> |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
drivers/tty/serial/8250/8250_gsc.c
between commit:
9e466f101e19 ("parisc/8250_gsc: Fix section mismatches")
from the parisc-hd tree and commit:
0d474f7fad3b ("tty: 8250: constify parisc_device_id")
from the tty tree.
I fixed it up (the former is a superset of the latter) 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-08-29 09:00 +0200 |
| Message-ID | <ujIFb-7Fd-3@gated-at.bofh.it> |
| In reply to | #1722179 |
On Tue, Aug 29, 2017 at 04:35:13PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/serial/8250/8250_gsc.c
>
> between commit:
>
> 9e466f101e19 ("parisc/8250_gsc: Fix section mismatches")
>
> from the parisc-hd tree and commit:
>
> 0d474f7fad3b ("tty: 8250: constify parisc_device_id")
>
> from the tty tree.
>
> I fixed it up (the former is a superset of the latter) 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 letting me know about this, and the other conflict here.
greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web