Re: linux-next: Tree for Dec 12
From: Paul Bolle
Date: Fri Dec 12 2014 - 05:32:05 EST
On Fri, 2014-12-12 at 21:04 +1100, Stephen Rothwell wrote:
> That patch has been in linux-next since Dec 3 as commit 77a4494388ab in
> Andrew's patch set (and maybe earlier).
Not earlier. Commit 77a4494388ab debuted in next-20141203:
$ git tag --contains 77a4494388ab
I missed that commit. But then again it never occurred to me that a
Kconfig symbol would be added and removed in one series. And, obviously,
grepping for INIT_FALLBACK didn't show anything in linux-next before
today (the oldest tree I checked was next-20141201, after which I lost
interest in going back any further).
> 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.
I won't be bothering (Andrew and) you again about this. Unless sorting
this out takes rather long, that is.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/