linux-kernel - Re: linux-next: manual merge of the tty tree with the tty.current 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: <20200917063438.GA3144339@kroah.com>
Date:   Thu, 17 Sep 2020 08:34:38 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Tobias Diedrich <tobiasdiedrich@...il.com>,
        Du Huanpeng <u74147@...il.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the tty.current
 tree

On Thu, Sep 17, 2020 at 04:09:46PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   drivers/tty/serial/8250/8250_pci.c
> 
> between commit:
> 
>   3c5a87be170a ("serial: 8250_pci: Add Realtek 816a and 816b")
> 
> from the tty.current tree and commit:
> 
>   04b6ff5f25de ("serial: 8250_pci: Add WCH384_8S 8 port serial device")
> 
> from the tty tree.
> 
> I fixed it up (see below) 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
> 
> diff --cc drivers/tty/serial/8250/8250_pci.c
> index 55bb7b897d97,85810b8b9d20..000000000000
> --- a/drivers/tty/serial/8250/8250_pci.c
> +++ b/drivers/tty/serial/8250/8250_pci.c
> @@@ -5566,17 -5618,10 +5618,21 @@@ static const struct pci_device_id seria
>   		PCI_ANY_ID, PCI_ANY_ID,
>   		0, 0, pbn_wch384_4 },
>   
> + 	{	PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_8S,
> + 		PCI_ANY_ID, PCI_ANY_ID,
> + 		0, 0, pbn_wch384_8 },
> + 
>  +	/*
>  +	 * Realtek RealManage
>  +	 */
>  +	{	PCI_VENDOR_ID_REALTEK, 0x816a,
>  +		PCI_ANY_ID, PCI_ANY_ID,
>  +		0, 0, pbn_b0_1_115200 },
>  +
>  +	{	PCI_VENDOR_ID_REALTEK, 0x816b,
>  +		PCI_ANY_ID, PCI_ANY_ID,
>  +		0, 0, pbn_b0_1_115200 },
>  +
>   	/* Fintek PCI serial cards */
>   	{ PCI_DEVICE(0x1c29, 0x1104), .driver_data = pbn_fintek_4 },
>   	{ PCI_DEVICE(0x1c29, 0x1108), .driver_data = pbn_fintek_8 },



Looks good, thanks!

greg k-h