Merge remote-tracking branch 'rcu/rcu/next'

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/irq.h
index d5ebd94822d28818a3971af59242b3f1d010871c,cd14cd4a22b4379a37b408ca6a51b8b402838045..c4de62348ff229194c85b133d45f0d220642b082
--- 1/include/linux/irq.h
--- 2/include/linux/irq.h
+++ b/include/linux/irq.h
@@@ -133,14 -133,11 +133,14 @@@ struct irq_domain
   *                    Use accessor functions to deal with it
   * @node:             node index useful for balancing
   * @handler_data:     per-IRQ data for the irq_chip methods
 - * @affinity:         IRQ affinity on SMP
 + * @affinity:         IRQ affinity on SMP. If this is an IPI
 + *                    related irq, then this is the mask of the
 + *                    CPUs to which an IPI can be sent.
   * @msi_desc:         MSI descriptor
 + * @ipi_offset:               Offset of first IPI target cpu in @affinity. Optional.
   */
  struct irq_common_data {
-       unsigned int            state_use_accessors;
+       unsigned int            __private state_use_accessors;
  #ifdef CONFIG_NUMA
        unsigned int            node;
  #endif

diff --cc kernel/irq/internals.h
Simple merge