linux-kernel - Re: linux-next: manual merge of the tty tree with the i.MX 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: <20110204042047.GA3331@kroah.com>
Date:	Thu, 3 Feb 2011 20:20:47 -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,
	Tomoya MORINAGA <tomoya-linux@....okisemi.com>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: Re: linux-next: manual merge of the tty tree with the i.MX tree

On Fri, Feb 04, 2011 at 03:14:08PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/Kconfig between commit
> 47d37d6f94ccf32d302492f969209930b2411f9e ("serial: Add auart driver for
> i.MX23/28") from the i.M tree and commit
> 4564e1ef219fa69ed827fe2613569543a6b26fbc ("serial: pch_uart: support new
> device ML7213") from the tty tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Looks good to me, thanks for handling this.

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/