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.

diff --cc arch/powerpc/include/asm/ptrace.h
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc arch/powerpc/sysdev/xive/common.c
index 458645c,8183ca3..c732ce5
--- 1/arch/powerpc/sysdev/xive/common.c
--- 2/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@@ -1166,6 -1170,22 +1157,22 @@@ out
        return ret;
  }
  
 -                        IRQF_PERCPU | IRQF_NO_THREAD,
+ static int xive_request_ipi(unsigned int cpu)
+ {
+       struct xive_ipi_desc *xid = &xive_ipis[early_cpu_to_node(cpu)];
+       int ret;
+ 
+       if (atomic_inc_return(&xid->started) > 1)
+               return 0;
+ 
+       ret = request_irq(xid->irq, xive_muxed_ipi_action,
++                        IRQF_NO_DEBUG | IRQF_PERCPU | IRQF_NO_THREAD,
+                         xid->name, NULL);
+ 
+       WARN(ret < 0, "Failed to request IPI %d: %d\n", xid->irq, ret);
+       return ret;
+ }
+ 
  static int xive_setup_cpu_ipi(unsigned int cpu)
  {
        unsigned int xive_ipi_irq = xive_ipi_cpu_to_irq(cpu);