Skip to content
  • Linus Torvalds's avatar
    Merge branch 'generic-ipi-for-linus' of... · 59190f42
    Linus Torvalds authored
    Merge branch 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits)
      generic-ipi: more merge fallout
      generic-ipi: merge fix
      x86, visws: use mach-default/entry_arch.h
      x86, visws: fix generic-ipi build
      generic-ipi: fixlet
      generic-ipi: fix s390 build bug
      generic-ipi: fix linux-next tree build failure
      fix: "smp_call_function: get rid of the unused nonatomic/retry argument"
      fix: "smp_call_function: get rid of the unused nonatomic/retry argument"
      fix "smp_call_function: get rid of the unused nonatomic/retry argument"
      on_each_cpu(): kill unused 'retry' parameter
      smp_call_function: get rid of the unused nonatomic/retry argument
      sh: convert to generic helpers for IPI function calls
      parisc: convert to generic helpers for IPI function calls
      mips: convert to generic helpers for IPI function calls
      m32r: convert to generic helpers for IPI function calls
      arm: convert to generic helpers for IPI function calls
      alpha: convert to generic helpers for IPI function calls
      ia64: convert to generic helpers for IPI function calls
      powerpc: convert to generic helpers for IPI function calls
      ...
    
    Fix trivial conflicts due to rcu updates in kernel/rcupdate.c manually
    59190f42