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] [thread-next>] [day] [month] [year] [list]

Message-ID: <4EA68955.8010102@atmel.com>
Date:	Tue, 25 Oct 2011 12:03:01 +0200
From:	Nicolas Ferre <nicolas.ferre@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	"Voss, Nikolaus" <N.Voss@...nmann.de>,
	Nicolas FERRE <nicolas.ferre@...el.com>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree

On 10/25/2011 10:18 AM, Stephen Rothwell :
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 0d0a3cc183c5 
> ("atmel_serial: fix atmel_default_console_device") from Linus' tree
> and commit 4cbf9f4864bd ("tty/serial: atmel_serial: auto-enumerate
> ports") from the tty tree.
> 
> I just used the tty tree version (which may not be completely
> correct).

I sent a patch now to fix this conflict. It can be applied on both
current tty-next and linux-next (obviously).

Sorry for the noise and thank you to having take care of this.

Best regards,
-- 
Nicolas Ferre
--
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/