• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 4bcec913
    Linus Torvalds authored
    Pull more powerpc bits from Ben Herrenschmidt:
     "Here are a few more powerpc bits for this merge window.  The bulk is
      made of two pull requests from Scott and Anatolij that I had missed
      previously (they arrived while I was away).  Since both their branches
      are in -next independently, and the content has been around for a
      little while, they can still go in.
    
      The rest is mostly bug and regression fixes, a small series of
      cleanups to our pseries cpuidle code (including moving it to the right
      place), and one new cpuidle bakend for the powernv platform.  I also
      wired up the new sched_attr syscalls"
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (37 commits)
      powerpc: Wire up sched_setattr and sched_getattr syscalls
      powerpc/hugetlb: Replace __get_cpu_var with get_cpu_var
      powerpc: Make sure "cache" directory is removed when offlining cpu
      powerpc/mm: Fix mmap errno when MAP_FIXED is set and mapping exceeds the allowed address space
      powerpc/powernv/cpuidle: Back-end cpuidle driver for powernv platform.
      powerpc/pseries/cpuidle: smt-snooze-delay cleanup.
      powerpc/pseries/cpuidle: Remove MAX_IDLE_STATE macro.
      powerpc/pseries/cpuidle: Make cpuidle-pseries backend driver a non-module.
      powerpc/pseries/cpuidle: Use cpuidle_register() for initialisation.
      powerpc/pseries/cpuidle: Move processor_idle.c to drivers/cpuidle.
      powerpc: Fix 32-bit frames for signals delivered when transactional
      powerpc/iommu: Fix initialisation of DART iommu table
      powerpc/numa: Fix decimal permissions
      powerpc/mm: Fix compile error of pgtable-ppc64.h
      powerpc: Fix hw breakpoints on !HAVE_HW_BREAKPOINT configurations
      clk: corenet: Adds the clock binding
      powerpc/booke64: Guard e6500 tlb handler with CONFIG_PPC_FSL_BOOK3E
      powerpc/512x: dts: add MPC5125 clock specs
      powerpc/512x: clk: support MPC5121/5123/5125 SoC variants
      powerpc/512x: clk: enforce even SDHC divider values
      ...
    4bcec913
mpc5121_nfc.c 20.3 KB