linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4B711A5F.7020304@petalogix.com>
Date:	Tue, 09 Feb 2010 09:18:39 +0100
From:	Michal Simek <michal.simek@...alogix.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the microblaze tree with Linus' tree

Stephen Rothwell wrote:
> 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.

Yes, I know about. I am fixing it.

Thanks,
Michal




-- 
Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/