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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
