linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <CAP=VYLoid=spfhT5z5AxgLuXPXxj5J4ZVv+JOcr2bXAjSYOu=w@mail.gmail.com>
Date:	Wed, 29 Jan 2014 22:33:48 -0500
From:	Paul Gortmaker <paul.gortmaker@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Alexander Graf <agraf@...e.de>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	LKML <linux-kernel@...r.kernel.org>,
	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>
Subject: Re: linux-next: manual merge of the init tree with the kvm/kvm-ppc trees

On Wed, Jan 29, 2014 at 10:27 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 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).

Thanks, I'll check it out tomorrow morning (EDT) once you've published
the latest linux-next and update accordingly,

Paul.
--

>
> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
--
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/