On Fri, Nov 6, 2020 at 10:44 AM Nathan Chancellor <natechancellor@xxxxxxxxx> wrote: > On Fri, Nov 06, 2020 at 09:28:09AM +0100, Ard Biesheuvel wrote: > > AFAIK there is an incompatible change in -next to change the > > definition of the __alias() macro > > Indeed. The following diff needs to be applied as a fixup to > treewide-remove-stringification-from-__alias-macro-definition.patch in > mmotm. > > Cheers, > Nathan > > diff --git a/arch/arm/boot/compressed/string.c b/arch/arm/boot/compressed/string.c > index 8c0fa276d994..cc6198f8a348 100644 > --- a/arch/arm/boot/compressed/string.c > +++ b/arch/arm/boot/compressed/string.c > @@ -21,9 +21,9 @@ > #undef memcpy > #undef memmove > #undef memset > -void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias(memcpy); > -void *__memmove(void *__dest, __const void *__src, size_t count) __alias(memmove); > -void *__memset(void *s, int c, size_t count) __alias(memset); > +void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias("memcpy"); > +void *__memmove(void *__dest, __const void *__src, size_t count) __alias("memmove"); > +void *__memset(void *s, int c, size_t count) __alias("memset"); > #endif > > void *memcpy(void *__dest, __const void *__src, size_t __n) Aha. So shall we submit this to Russell? I figure that his git will not build *without* the changes from mmotm? That tree isn't using git either is it? Is this one of those cases where we should ask Stephen R to carry this patch on top of -next until the merge window? Yours, Linus Walleij