From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrei Pistirica <andrei.pistirica@microchip.com>,
Joshua Henderson <joshua.henderson@microchip.com>,
Vladimir Murzin <vladimir.murzin@arm.com>
Subject: Re: linux-next: manual merge of the tty tree with the mips tree
Date: Mon, 2 May 2016 08:28:15 -0700 [thread overview]
Message-ID: <20160502152815.GB27283@kroah.com> (raw)
In-Reply-To: <20160502155201.306e1cef@canb.auug.org.au>
On Mon, May 02, 2016 at 03:52:01PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/serial/Makefile
> include/uapi/linux/serial_core.h
>
> between commit:
>
> a484a06f7cb1 ("serial: pic32_uart: Add PIC32 UART driver")
>
> from the mips tree and commit:
>
> 041f031def33 ("serial: mps2-uart: add MPS2 UART driver")
>
> from the tty tree.
>
> I fixed it up (see below - I assume the numbers in
> uapi/linux/serial_core.h are meant to be unique?)
Yes they are, thanks. It's a horrid old api :(
> 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.
Fix looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2016-05-02 15:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 5:52 linux-next: manual merge of the tty tree with the mips tree Stephen Rothwell
2016-05-02 15:28 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-09 10:59 Stephen Rothwell
2015-06-09 21:10 ` Greg KH
2011-11-18 3:22 Stephen Rothwell
2011-11-18 16:19 ` 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=20160502152815.GB27283@kroah.com \
--to=greg@kroah.com \
--cc=andrei.pistirica@microchip.com \
--cc=joshua.henderson@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=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