Re: linux-next: build failure after merge of the akpm-current tree

Andrew Morton
2016-02-26T21:33:51Z

On Fri, 26 Feb 2016 12:10:06 -0800 Dave Hansen <dave.hansen@linux.intel.com> wrote:

> 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 <sfr@canb.auug.org.au>
> > ---
> > 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 <dave.hansen@linux.intel.com>

I've moved add-compile-time-check-for-__arch_si_preamble_size.patch to
be after linux-next and have added this patch (as
add-compile-time-check-for-__arch_si_preamble_size-fix.patch) to be
folded into add-compile-time-check-for-__arch_si_preamble_size.patch
later on.

So no -tip changes should be needed.