Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 3 Sep 2021 12:54:12 +0000 (22:54 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 3 Sep 2021 12:54:12 +0000 (22:54 +1000)
commita3314262eede9c909a0c797f16f25f941d12c78d
tree4ec2b6857f839e9f4c86c9a08c9ccc4528ed0e9f
parente432fe97f3e5de325b40021e505cce53877586c5
parent787c70f2f9990b5a197320152d2fc32cd8a6ad1a
Merge branch 'fixes' into next

Merge our fixes branch into next.

That lets us resolve a conflict in arch/powerpc/sysdev/xive/common.c.

Between cbc06f051c52 ("powerpc/xive: Do not skip CPU-less nodes when
creating the IPIs"), which moved request_irq() out of xive_init_ipis(),
and 17df41fec5b8 ("powerpc: use IRQF_NO_DEBUG for IPIs") which added
IRQF_NO_DEBUG to that request_irq() call, which has now moved.
arch/powerpc/include/asm/ptrace.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/time.c
arch/powerpc/kernel/traps.c
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/sysdev/xive/common.c