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

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

Date:	Mon, 8 Aug 2011 12:36:27 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Mundt <lethal@...ux-sh.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: linux-next: manual merge of the sh tree with Linus' tree

Hi Paul,

Today's linux-next merge of the sh tree got a conflict in
drivers/tty/serial/sh-sci.c between commit fc97114b8d67 ("sh: Fix boot
crash related to SCI") from Linus' tree and commit ad75b88ac379 ("serial:
sh-sci: Fix up default regtype probing") from the sh tree.

These do the same thing slightly differently ("ret" v. "ret != 0").  I
used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped