linux-kernel - linux-next: manual merge of the init tree with the kvm/kvm-ppc trees

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20140130142708.6d47d4d63683e32b7ae16c80@canb.auug.org.au>
Date:	Thu, 30 Jan 2014 14:27:08 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>,
	Alexander Graf <agraf@...e.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>
Subject: linux-next: manual merge of the init tree with the kvm/kvm-ppc
 trees

Hi Paul,

Today's linux-next merge of the init tree got conflicts in
arch/powerpc/kvm/44x.c, arch/powerpc/kvm/e500.c,
arch/powerpc/kvm/e500mc.c between commit 398a76c677a2 ("KVM: PPC: Add
devname:kvm aliases for modules") from the kvm/kvm-ppc trees and commit
"powerpc: kvm e500/44x is not modular, so don't use module_init" from the
init tree.

It sounds like there may be some intent to allow these to be built as
modules in the future, so for now I have just reverted the init tree
patch to these files 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