Re: linux-next: manual merge of the akpm tree with the tip tree
From: Andrew Morton
Date: Wed Apr 08 2015 - 16:46:31 EST
On Wed, 8 Apr 2015 17:13:51 +0200 Ingo Molnar <mingo@xxxxxxxxxx> wrote:
> * 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?
Stephen didn't include the -mm patch so I guess that ID never was
included in -next.
For -mm patches the place to bookmark is
It sounds like the warning has now been fixed.
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/