linux-kernel - linux-next: manual merge of the akpm-current tree with the kvm 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: <20130207170319.5b5c471398b134c676f9dc6c@canb.auug.org.au>
Date:	Thu, 7 Feb 2013 17:03:19 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...hat.com>
Subject: linux-next: manual merge of the akpm-current tree with the kvm tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/kvm/mmu.c between commit 9bb4f6b15ec0 ("KVM: MMU: drop unneeded
checks") from the kvm tree and commit "hlist: drop the node parameter
from iterators" from the akpm-current tree.

I fixed it up (the conflicts were caused by bad white space changes in
the akpm tree patch) 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