linux-kernel - linux-next: manual merge of the trivial 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-next>] [day] [month] [year] [list]

Message-Id: <20100810121117.8710aa26.sfr@canb.auug.org.au>
Date:	Tue, 10 Aug 2010 12:11:17 +1000
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,
	Paul Bolle <pebolle@...cali.nl>,
	Christoph Egger <siccegge@...fau.de>
Subject: linux-next: manual merge of the trivial tree with Linus' tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-omap1/board-nokia770.c between commit
ab6f7751905e5cf713d081dbb3b97b8f6909ab34 ("Removing dead OMAP_DSP") from
Linus' tree and commit 426d31071ac476ea62c62656b242930c17b58c00 ("fix
printk typo 'faild'") from the trivial tree.

The former removes the code that the latter is updating.  So I just
removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped