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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20150408134626.0de0d209e49d3911d46228d5@linux-foundation.org>
Date:	Wed, 8 Apr 2015 13:46:26 -0700
From:	Andrew Morton <akpm@...ux-foundation.org>
To:	Ingo Molnar <mingo@...nel.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Borislav Petkov <bp@...en8.de>
Subject: Re: linux-next: manual merge of the akpm tree with the tip tree

On Wed, 8 Apr 2015 17:13:51 +0200 Ingo Molnar <mingo@...nel.org> wrote:

> 
> * Stephen Rothwell <sfr@...b.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/