linux-kernel - linux-next: manual merge of the tty tree with Linus' 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-next>] [day] [month] [year] [list]

Date:	Tue, 25 Oct 2011 19:12:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tomoya MORINAGA <tomoya-linux@....okisemi.com>
Subject: linux-next: manual merge of the tty tree with Linus' tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250_pci.c between commit dacacc3e794c
("serial/8250_pci: delete duplicate data definition") from Linus' tree
and commit 64d91cfaade2 ("8250_pci: Fix kernel panic when pch_uart is
disabled") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/tty/serial/8250_pci.c
index 3abeca2,1b449b7..0000000
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@@ -1598,7 -1639,14 +1639,8 @@@ static struct pci_serial_quirk pci_seri
  		.vendor         = 0x10DB,
  		.device         = 0x800D,
  		.init		= pci_eg20t_init,
+ 		.setup		= pci_default_setup,
  	},
 -	{
 -		.vendor         = 0x10DB,
 -		.device         = 0x800D,
 -		.init		= pci_eg20t_init,
 -		.setup		= pci_default_setup,
 -	},
  	/*
  	 * Cronyx Omega PCI (PLX-chip based)
  	 */

Content of type "application/pgp-signature" skipped