From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Paul Bolle <pebolle@tiscali.nl>,
Valentin Rothberg <valentinrothberg@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Lutomirski <luto@amacapital.net>,
Josh Triplett <josh@joshtriplett.org>
Subject: Re: linux-next: Tree for Dec 12
Date: Sat, 13 Dec 2014 15:10:26 +1100 [thread overview]
Message-ID: <20141213151026.79a75a8f@canb.auug.org.au> (raw)
In-Reply-To: <20141212145623.dc2394c57c2254b2603456e4@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
Hi Andrew,
On Fri, 12 Dec 2014 14:56:23 -0800 Andrew Morton <akpm@linux-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@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-12-13 4:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 7:35 linux-next: Tree for Dec 12 Stephen Rothwell
2014-12-12 9:49 ` Paul Bolle
2014-12-12 10:04 ` Stephen Rothwell
2014-12-12 10:31 ` Paul Bolle
2014-12-12 21:57 ` Andrew Morton
2014-12-12 22:36 ` Paul Bolle
2014-12-12 22:56 ` Andrew Morton
2014-12-13 4:10 ` Stephen Rothwell [this message]
2014-12-12 19:00 ` linux-next: Tree for Dec 12 (sound/soc/codecs/rt5640) Randy Dunlap
2014-12-12 21:15 ` linux-next: Tree for Dec 12 (net/bridge) Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2023-12-12 3:32 linux-next: Tree for Dec 12 Stephen Rothwell
2023-12-12 6:25 ` Stephen Rothwell
2019-12-12 4:50 Stephen Rothwell
2018-12-12 6:32 Stephen Rothwell
2017-12-12 5:29 Stephen Rothwell
2016-12-12 6:39 Stephen Rothwell
2013-12-12 6:06 Stephen Rothwell
2011-12-12 5:14 Stephen Rothwell
2011-12-12 21:26 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141213151026.79a75a8f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=pebolle@tiscali.nl \
--cc=valentinrothberg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).