From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753956Ab2B0GC1 (ORCPT ); Mon, 27 Feb 2012 01:02:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:44000 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594Ab2B0GC0 (ORCPT ); Mon, 27 Feb 2012 01:02:26 -0500 Message-ID: <4F4B1C31.7070808@zytor.com> Date: Sun, 26 Feb 2012 22:01:21 -0800 From: "H. Peter Anvin" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.1) Gecko/20120209 Thunderbird/10.0.1 MIME-Version: 1.0 To: Stephen Rothwell CC: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Cyrill Gorcunov Subject: Re: linux-next: manual merge of the akpm tree with the tip tree References: <20120227165356.6119ac92eabd7052fc56c741@canb.auug.org.au> In-Reply-To: <20120227165356.6119ac92eabd7052fc56c741@canb.auug.org.au> X-Enigmail-Version: 1.3.5 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/26/2012 09:53 PM, 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". It should be "common" (otherwise there would need to be an x32 variant which would point to the compat version of the call, but in this case even the i386 entry point goes straight to sys_kcmp.) -hpa -- H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.