From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755045AbcBZUKJ (ORCPT ); Fri, 26 Feb 2016 15:10:09 -0500 Received: from mga02.intel.com ([134.134.136.20]:60385 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750915AbcBZUKI (ORCPT ); Fri, 26 Feb 2016 15:10:08 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,504,1449561600"; d="scan'208";a="921950121" Subject: Re: linux-next: build failure after merge of the akpm-current tree To: Stephen Rothwell , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra References: <20160226164406.065a1ffc@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Helge Deller From: Dave Hansen Message-ID: <56D0B11E.2050402@linux.intel.com> Date: Fri, 26 Feb 2016 12:10:06 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160226164406.065a1ffc@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/25/2016 09:44 PM, Stephen Rothwell wrote: > Fixes: cd0ea35ff551 ("signals, pkeys: Notify userspace about protection key faults") > Signed-off-by: Stephen Rothwell > --- > arch/ia64/include/uapi/asm/siginfo.h | 2 +- > arch/mips/include/uapi/asm/siginfo.h | 2 +- > include/uapi/asm-generic/siginfo.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h > index 0151cfab929d..0c660bbccd3f 100644 > --- a/arch/ia64/include/uapi/asm/siginfo.h > +++ b/arch/ia64/include/uapi/asm/siginfo.h > @@ -70,7 +70,7 @@ typedef struct siginfo { > void __user *_upper; > } _addr_bnd; > /* used when si_code=SEGV_PKUERR */ > - u64 _pkey; > + int _pkey; > }; > } _sigfault; Considering Peter's feedback on my 'unsigned long' approach, I'm fine with your patch, Stephen. Can it just be picked up in to the tip tree? Acked-by: Dave Hansen