Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753905Ab2B0F5b (ORCPT ); Mon, 27 Feb 2012 00:57:31 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:41962 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751263Ab2B0F5a (ORCPT ); Mon, 27 Feb 2012 00:57:30 -0500 Date: Mon, 27 Feb 2012 09:57:25 +0400 From: Cyrill Gorcunov To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Subject: Re: linux-next: manual merge of the akpm tree with the tip tree Message-ID: <20120227055725.GC1904@moon> References: <20120227165356.6119ac92eabd7052fc56c741@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120227165356.6119ac92eabd7052fc56c741@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 Content-Length: 831 Lines: 21 On Mon, Feb 27, 2012 at 04:53:56PM +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > arch/x86/syscalls/syscall_64.tbl between commit > arch/x86/syscalls/syscall_64.tbl ("x32: Add x32 system calls to > syscall/syscall_64.tbl") from the tip tree and commit "syscalls, x86: add > __NR_kcmp syscall" from the akpm tree. > > I fixed it up (see below) but did not know if this call should be marked > "common". Hi Stephen, letme fetch both trees to figure out what this new column means. Will ping back shortly. Thanks! Cyrill -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/