From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751549AbbJLGTM (ORCPT ); Mon, 12 Oct 2015 02:19:12 -0400 Received: from helcar.hengli.com.au ([209.40.204.226]:38270 "EHLO helcar.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbbJLGTJ (ORCPT ); Mon, 12 Oct 2015 02:19:09 -0400 Date: Mon, 12 Oct 2015 14:18:13 +0800 From: Herbert Xu To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, tim , Andy Lutomirski Subject: Re: linux-next: manual merge of the tip tree with the crypto tree Message-ID: <20151012061813.GA24709@gondor.apana.org.au> References: <20151012142421.2799de5c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151012142421.2799de5c@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 12, 2015 at 02:24:21PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/Makefile > > between commit: > > e38b6b7fcfd1 ("crypto: x86/sha - Add build support for Intel SHA Extensions optimized SHA1 and SHA256") > > from the crypto tree and commit: > > 7b956f035a9e ("x86/asm: Re-add parts of the manual CFI infrastructure") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks Stephen. -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt