Michael Ellerman f96271cefe Merge branch 'master' into next ...

Merge master back into next, this allows us to resolve some conflicts in
arch/powerpc/Kconfig, and also re-sort the symbols under config PPC so
that they are in alphabetical order again.

2021-05-08 21:12:55 +10:00

..

asm

Merge branch 'master' into next

2021-05-08 21:12:55 +10:00

uapi/asm

powerpc: fix EDEADLOCK redefinition error in uapi/asm/errno.h

2021-04-17 10:40:51 +10:00