linux-kernel - linux-next: manual merge of the microblaze 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: <20100209110710.c7b6992b.sfr@canb.auug.org.au>
Date:	Tue, 9 Feb 2010 11:07:10 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Michal Simek <michal.simek@...alogix.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the microblaze tree with Linus' tree

Hi Michal,

Today's linux-next merge of the microblaze tree got a conflict in
arch/microblaze/kernel/setup.c between commit
a6013411118a6c8c34f1bd8b047b36fdf9711590 ("microblaze: Invalidate dcache
before enabling it") from Linus' tree and commit
578059c56c816db2b696a196d3656afc187c7edd ("microblaze: Move cache
function to cache.c") from the microblaze tree.

The microblaze tree version supercedes the version from Linus' tree, so I
used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped