From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932423AbbDHPOA (ORCPT ); Wed, 8 Apr 2015 11:14:00 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:32947 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753302AbbDHPNz (ORCPT ); Wed, 8 Apr 2015 11:13:55 -0400 Date: Wed, 8 Apr 2015 17:13:51 +0200 From: Ingo Molnar To: Stephen Rothwell Cc: Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov Subject: Re: linux-next: manual merge of the akpm tree with the tip tree Message-ID: <20150408151350.GA8490@gmail.com> References: <20150408184954.1356280d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150408184954.1356280d@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell 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? Thanks, Ingo