linux-kernel - linux-next: manual merge of the trivial tree with the sparc 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, 22 Feb 2010 14:13:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Frans Pop <elendil@...net.nl>,
	David Miller <davem@...emloft.net>,
	Daniel Mack <daniel@...aq.de>
Subject: linux-next: manual merge of the trivial tree with the sparc tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/sparc/kernel/leon_kernel.c between commit
0da2b300b91ddeb9944c3fb4faaf78c1c482c0af ("sparc: remove trailing space
in messages") from the sparc tree and commit
3ad2f3fbb961429d2aa627465ae4829758bc7e07 ("tree-wide: Assorted spelling
fixes") from the trivial tree.

The former also fixed the spelling mistake fixed by the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped