From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Helge Deller <deller@gmx.de>,
Parisc List <linux-parisc@vger.kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Arvind Yadav <arvind.yadav.cs@gmail.com>
Subject: Re: linux-next: manual merge of the tty tree with the parisc-hd tree
Date: Tue, 29 Aug 2017 08:58:10 +0200 [thread overview]
Message-ID: <20170829065810.GB13428@kroah.com> (raw)
In-Reply-To: <20170829163513.4b119a91@canb.auug.org.au>
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
next prev parent reply other threads:[~2017-08-29 6:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-29 6:35 linux-next: manual merge of the tty tree with the parisc-hd tree Stephen Rothwell
2017-08-29 6:58 ` Greg KH [this message]
2017-08-29 6:38 Stephen Rothwell
2020-10-13 4:43 Stephen Rothwell
2021-08-30 5:46 Stephen Rothwell
2021-08-30 7:14 ` Helge Deller
2021-08-30 7:33 ` Stephen Rothwell
2021-08-30 8:17 ` Helge Deller
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=20170829065810.GB13428@kroah.com \
--to=greg@kroah.com \
--cc=arvind.yadav.cs@gmail.com \
--cc=deller@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@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).