Re: linux-next: manual merge of the akpm tree with the tip tree

From: Ingo Molnar
Date: Wed Apr 08 2015 - 11:14:37 EST

* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi Andrew,
> Today's linux-next merge of the akpm tree got a conflict in
> arch/x86/kernel/cpu/common.c between commit 6b51311c9765
> ("x86/asm/entry/64: Use a define for an invalid segment selector") from
> the tip tree and commit f28c11e4b695 ("arch/x86/kernel/cpu/common.c:
> fix warning") from the akpm tree.

So f28c11e4b695 doesn't appear to be in linux-next as fetched a minute

triton:~/linux.trees.git> git log f28c11e4b695 --
fatal: bad revision 'f28c11e4b695'
triton:~/linux.trees.git> git describe

How am I supposed to fetch and interpret such sha1's?


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at