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: <20130509103513.8432fb1f7834a57de404f2a7@canb.auug.org.au>
Date:	Thu, 9 May 2013 10:35:13 +1000
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,
	Jiang Liu <liuj97@...il.com>,
	Andrew Morton <akpm@...ux-foundation.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/mm/init.c between commit 7beb5987875b ("mm/microblaze:
use common help functions to free reserved pages") from Linus' tree and
commits 17408c87ba9e ("microblaze: Fix free_init_pages function") and
c5c09c08718b ("microblaze: Fix initrd support") from the microblaze tree.

I just used the version from Linus' tree (I am not sure if that is the
correct solution) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped