linux-kernel - Re: linux-next: manual merge of the trivial tree with the 4xx 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] [day] [month] [year] [list]

Message-ID: <CA+5PVA5Ww-_CHTaTLSVih9D6sihrD0TGwHGwGbG5-tDZPcer2w@mail.gmail.com>
Date:	Thu, 1 Dec 2011 10:39:43 -0500
From:	Josh Boyer <jwboyer@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jiri Kosina <jkosina@...e.cz>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Tanmay Inamdar <tinamdar@....com>,
	Paul Bolle <pebolle@...cali.nl>
Subject: Re: linux-next: manual merge of the trivial tree with the 4xx tree

On Wed, Nov 30, 2011 at 9:16 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/powerpc/platforms/40x/Kconfig between commit d5b9ee7b514e
> ("powerpc/40x: Add APM8018X SOC support") from the 4xx tree and commit
> ff5f483f3091 ("powerpc: 4xx: remove commented out Kconfig entries") from
> the trivial tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

That seems correct to me.  If you don't mind carrying it, I'd appreciate it.

josh
--
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/