lkml.org 
[lkml]   [2015]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm tree with the tip tree
On Wed, 8 Apr 2015 17:13:51 +0200 Ingo Molnar <mingo@kernel.org> wrote:

>
> * Stephen Rothwell <sfr@canb.auug.org.au> 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
> ago:
>
> triton:~/linux.trees.git> git log f28c11e4b695 --
> fatal: bad revision 'f28c11e4b695'
> triton:~/linux.trees.git> git describe
> next-20150408
>
> 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
http://ozlabs.org/~akpm/mmotm/broken-out/.

This:
http://ozlabs.org/~akpm/mmotm/broken-out/arch-x86-kernel-cpu-commonc-fix-warning.patch

It sounds like the warning has now been fixed.


\
 
 \ /
  Last update: 2015-04-08 23:21    [W:0.068 / U:0.712 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site