• Linus Torvalds's avatar
    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5047887c
    Linus Torvalds authored
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
      powerpc: Wireup new syscalls
      Move update_mmu_cache() declaration from tlbflush.h to pgtable.h
      powerpc/pseries: Remove kmalloc call in handling writes to lparcfg
      powerpc/pseries: Update arch vector to indicate support for CMO
      ibmvfc: Add support for collaborative memory overcommit
      ibmvscsi: driver enablement for CMO
      ibmveth: enable driver for CMO
      ibmveth: Automatically enable larger rx buffer pools for larger mtu
      powerpc/pseries: Verify CMO memory entitlement updates with virtual I/O
      powerpc/pseries: vio bus support for CMO
      powerpc/pseries: iommu enablement for CMO
      powerpc/pseries: Add CMO paging statistics
      powerpc/pseries: Add collaborative memory manager
      powerpc/pseries: Utilities to set firmware page state
      powerpc/pseries: Enable CMO feature during platform setup
      powerpc/pseries: Split retrieval of processor entitlement data into a helper routine
      powerpc/pseries: Add memory entitlement capabilities to /proc/ppc64/lparcfg
      powerpc/pseries: Split processor entitlement retrieval and gathering to helper routines
      powerpc/pseries: Remove extraneous error reporting for hcall failures in lparcfg
      powerpc: Fix compile error with binutils 2.15
      ...
    
    Fixed up conflict in arch/powerpc/platforms/52xx/Kconfig manually.
    5047887c
binfmt_elf.c 53.9 KB