Hi Andrew, On Fri, 12 Dec 2014 14:56:23 -0800 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
Attachment:
pgpA5MUHlai7X.pgp
Description: OpenPGP digital signature
