linux-kernel - linux-next: manual merge of the tty tree with the arm 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 6 Nov 2012 14:53:32 +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,
	Shubhrajyoti D <shubhrajyoti@...com>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the tty tree with the arm tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/omap-serial.c between commit d864c03bfce2 ("SERIAL:
omap: remove setting of EFR SCD bit") from the arm tree and commit
7ba897d77ce2 ("serial: omap: Remove the default setting of special
character") from the tty tree.

I fixed it up (using the version from the arm tree) and can carry the fix
as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped