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]

Message-Id: <20130117130423.63a5e1004942853bf6a49e56@canb.auug.org.au>
Date:	Thu, 17 Jan 2013 13:04:23 +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,
	Steven Rostedt <rostedt@...dmis.org>
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/staging/sb105x/Kconfig between commit db210312f77b ("staging:
Make SystemBase PCI Multiport UART only for x86") from the  tree and
commit e27a7d7977b0 ("Staging: sb105x: mark it BROKEN") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/staging/sb105x/Kconfig
index 1facad6,3d0d0eb..0000000
--- a/drivers/staging/sb105x/Kconfig
+++ b/drivers/staging/sb105x/Kconfig
@@@ -1,8 -1,7 +1,8 @@@
  config SB105X
  	tristate "SystemBase PCI Multiport UART"
  	select SERIAL_CORE
- 	depends on PCI
+ 	depends on PCI && BROKEN
 +	depends on X86
  	help
  	  A driver for the SystemBase Multi-2/PCI serial card
  

Content of type "application/pgp-signature" skipped