linux-kernel - Re: linux-next: manual merge of the tty tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20160502152815.GB27283@kroah.com>
Date:	Mon, 2 May 2016 08:28:15 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Ralf Baechle <ralf@...ux-mips.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Andrei Pistirica <andrei.pistirica@...rochip.com>,
	Joshua Henderson <joshua.henderson@...rochip.com>,
	Vladimir Murzin <vladimir.murzin@....com>
Subject: Re: linux-next: manual merge of the tty tree with the mips tree

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