Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 018cace2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux 

Pull powerpc fixes from Michael Ellerman:
 "Ben's travelling so this is my first attempt at a pull request.

  There's nothing too exciting.  The CONFIG_FHANDLE one is annoying, I
  know you love defconfig changes.  But we've had a couple of developers
  waste time debugging boxes that wouldn't boot, only to realise it's
  just that systemd needs CONFIG_FHANDLE and our defconfigs don't have
  it.

  The new syscalls seem to be working, I've run the selftests that
  exist, and also let trinity bash on them for a while"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()
  powerpc: Make CONFIG_FHANDLE=y for all 64 bit powerpc defconfigs
  powerpc: use machine_subsys_initcall() for opal_hmi_handler_init()
  powerpc/perf: Fix ABIv2 kernel backtraces
  powerpc/pseries: Fix endian issues in memory hotplug
parents 8381e57a 7d59deb5

arch/powerpc/configs/cell_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_SMP=y 
CONFIG_NR_CPUS=4

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=15

arch/powerpc/configs/celleb_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_SMP=y 
CONFIG_NR_CPUS=4

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=15

arch/powerpc/configs/corenet64_smp_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ CONFIG_ALTIVEC=y 
CONFIG_SMP=y

CONFIG_NR_CPUS=24

CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

arch/powerpc/configs/g5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_NR_CPUS=4 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_BLK_DEV_INITRD=y

arch/powerpc/configs/maple_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ CONFIG_NR_CPUS=4 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_COMPAT_BRK is not set