Hi James, On Tue, 2 May 2017 22:26:05 +0100 James Hogan <james.hogan@xxxxxxxxxx> wrote: > > > diff --git a/arch/metag/include/asm/uaccess.h b/arch/metag/include/asm/uaccess.h > > index 469a2f1393d3..1e5f26d2dce8 100644 > > --- a/arch/metag/include/asm/uaccess.h > > +++ b/arch/metag/include/asm/uaccess.h > > @@ -28,24 +28,32 @@ > > > > #define segment_eq(a, b) ((a).seg == (b).seg) > > > > -#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS)) > > FYI this patch, commit 8a8b56638bca ("metag/uaccess: Fix access_ok()"), > just pushed to metag/for-next, will conflict with Al's commit > db68ce10c4f0 ("new helper: uaccess_kernel()") from his vfs/for-next > branch. > > This change should supersede Al's metag change, i.e. __kernel_ok should > be removed from this file. Thanks for letting me know. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-metag" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html