From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Bolle <pebolle@tiscali.nl>
Cc: Valentin Rothberg <valentinrothberg@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: Tree for Dec 12
Date: Fri, 12 Dec 2014 21:04:49 +1100 [thread overview]
Message-ID: <20141212210449.7f460bb1@canb.auug.org.au> (raw)
In-Reply-To: <1418377757.5756.24.camel@x220>
[-- Attachment #1: Type: text/plain, Size: 1849 bytes --]
Hi Paul,
On Fri, 12 Dec 2014 10:49:17 +0100 Paul Bolle <pebolle@tiscali.nl> wrote:
>
> > $ git checkout master
> > $ git reset --hard stable
> > [...]
> > Merging akpm-current/current (35ac317b788c shmdt: use i_size_read() instead of ->i_size)
> > CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile
> > CONFLICT (content): Merge conflict in mm/page_alloc.c
> > CONFLICT (content): Merge conflict in mm/memcontrol.c
> > CONFLICT (content): Merge conflict in mm/hugetlb.c
> > CONFLICT (content): Merge conflict in kernel/printk/printk.c
> > CONFLICT (content): Merge conflict in kernel/exit.c
> > CONFLICT (content): Merge conflict in init/main.c
>
> I think the conflict resolution here can be found in your merge commit
> bcab756e1d32 ("Merge branch 'akpm-current/current'").
>
> For some reason it removes the only check for CONFIG_INIT_FALLBACK. I
> only noticed because that makes the Kconfig entry INIT_FALLBACK a nop.
> That check and Kconfig entry were added in commit 6ef4536e2f19 ("init:
> allow CONFIG_INIT_FALLBACK=n to disable defaults if init= fails"). That
> commit debuted in today's linux-next.
That patch has been in linux-next since Dec 3 as commit 77a4494388ab in
Andrew's patch set (and maybe earlier). However, also in Adnrew's
patch set is another patch ("init: remove CONFIG_INIT_FALLBACK") that
then removes CONFIG_INIT_FALLBACK. There is a conflict because the
first has gone into Linus' tree today (as commit 6ef4536e2f19), but the
second has not (I don't know why not).
Hmmm, I would have expected the Kconfig entry to be removed as well,
but either I missed that, or git is not as clever as I expect it to be.
> Anyhow, I'm sure this all will be sorted out in due time.
I hope so.
--
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-12 10:04 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 [this message]
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
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=20141212210449.7f460bb1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).