linux-kernel - Re: linux-next: Tree for Dec 12

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: <20141213151026.79a75a8f@canb.auug.org.au>
Date:	Sat, 13 Dec 2014 15:10:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	Paul Bolle <pebolle@...cali.nl>,
	Valentin Rothberg <valentinrothberg@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Lutomirski <luto@...capital.net>,
	Josh Triplett <josh@...htriplett.org>
Subject: Re: linux-next: Tree for Dec 12

Hi Andrew,

On Fri, 12 Dec 2014 14:56:23 -0800 Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> How'd that happen? 
> http://ozlabs.org/~akpm/mmots/broken-out/init-remove-config_init_fallback.patch
> removes all mention of CONFIG_INIT_FALLBACK?

Well, the patch now in Linus's tree adds the INIT_FALLBACK bit to the
Kconfig file, but in your patchset, the bit is added and then removed.
So when git comes to merge the two results, it looks like the
apm-current branch in linux-next does not change that file at all, so
git just uses the version from Linus' tree.  I missed it among all the
other conflicts I had to fix up last evening.

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

Content of type "application/pgp-signature" skipped