linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20130118004112.GA29380@kroah.com>
Date:	Thu, 17 Jan 2013 16:41:12 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Steven Rostedt <rostedt@...dmis.org>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree

On Thu, Jan 17, 2013 at 01:04:23PM +1100, Stephen Rothwell wrote:
> 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

Looks good to me, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/