Merge tag 'powerpc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

Pull powerpc updates from Michael Ellerman:
 "Highlights:

   - Enable support for memory protection keys aka "pkeys" on Power7/8/9
     when using the hash table MMU.

   - Extend our interrupt soft masking to support masking PMU interrupts
     as well as "normal" interrupts, and then use that to implement
     local_t for a ~4x speedup vs the current atomics-based
     implementation.

   - A new driver "ocxl" for "Open Coherent Accelerator Processor
     Interface (OpenCAPI)" devices.

   - Support for new device tree properties on PowerVM to describe
     hotpluggable memory and devices.

   - Add support for CLOCK_{REALTIME/MONOTONIC}_COARSE to the 64-bit
     VDSO.

   - Freescale updates from Scott: fixes for CPM GPIO and an FSL PCI
     erratum workaround, plus a minor cleanup patch.

  As well as quite a lot of other changes all over the place, and small
  fixes and cleanups as always.

  Thanks to: Alan Modra, Alastair D'Silva, Alexey Kardashevskiy,
  Alistair Popple, Andreas Schwab, Andrew Donnellan, Aneesh Kumar K.V,
  Anju T Sudhakar, Anshuman Khandual, Anton Blanchard, Arnd Bergmann,
  Balbir Singh, Benjamin Herrenschmidt, Bhaktipriya Shridhar, Bryant G.
  Ly, Cédric Le Goater, Christophe Leroy, Christophe Lombard, Cyril Bur,
  David Gibson, Desnes A. Nunes do Rosario, Dmitry Torokhov, Frederic
  Barrat, Geert Uytterhoeven, Guilherme G. Piccoli, Gustavo A. R. Silva,
  Gustavo Romero, Ivan Mikhaylov, Joakim Tjernlund, Joe Perches, Josh
  Poimboeuf, Juan J. Alvarez, Julia Cartwright, Kamalesh Babulal,
  Madhavan Srinivasan, Mahesh Salgaonkar, Mathieu Malaterre, Michael
  Bringmann, Michael Hanselmann, Michael Neuling, Nathan Fontenot,
  Naveen N. Rao, Nicholas Piggin, Paul Mackerras, Philippe Bergheaud,
  Ram Pai, Russell Currey, Santosh Sivaraj, Scott Wood, Seth Forshee,
  Simon Guo, Stewart Smith, Sukadev Bhattiprolu, Thiago Jung Bauermann,
  Vaibhav Jain, Vasyl Gomonovych"

* tag 'powerpc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (199 commits)
  powerpc/mm/radix: Fix build error when RADIX_MMU=n
  macintosh/ams-input: Use true and false for boolean values
  macintosh: change some data types from int to bool
  powerpc/watchdog: Print the NIP in soft_nmi_interrupt()
  powerpc/watchdog: regs can't be null in soft_nmi_interrupt()
  powerpc/watchdog: Tweak watchdog printks
  powerpc/cell: Remove axonram driver
  rtc-opal: Fix handling of firmware error codes, prevent busy loops
  powerpc/mpc52xx_gpt: make use of raw_spinlock variants
  macintosh/adb: Properly mark continued kernel messages
  powerpc/pseries: Fix cpu hotplug crash with memoryless nodes
  powerpc/numa: Ensure nodes initialized for hotplug
  powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes
  powerpc/kernel: Block interrupts when updating TIDR
  powerpc/powernv/idoa: Remove unnecessary pcidev from pci_dn
  powerpc/mm/nohash: do not flush the entire mm when range is a single page
  powerpc/pseries: Add Initialization of VF Bars
  powerpc/pseries/pci: Associate PEs to VFs in configure SR-IOV
  powerpc/eeh: Add EEH notify resume sysfs
  powerpc/eeh: Add EEH operations to notify resume
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
index 73fcf592ee9143703484b27f7cc65ef702217b4a,fddc4478d4d881667395a6cb69bc6f429eb6d4ed..9d3329811cc17f7a1d9a4ca8941b9462cf531047
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -150,7 -150,9 +151,8 @@@ config PP
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
+       select ARCH_OPTIONAL_KERNEL_RWX         if ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_SUPPORTS_ATOMIC_RMW
 -      select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
        select ARCH_USE_BUILTIN_BSWAP
        select ARCH_USE_CMPXCHG_LOCKREF         if PPC64
        select ARCH_WANT_IPC_PARSE_VERSION

diff --cc arch/powerpc/configs/powernv_defconfig
Simple merge

diff --cc arch/powerpc/include/asm/book3s/64/hash-4k.h
Simple merge

diff --cc arch/powerpc/include/asm/book3s/64/hash-64k.h
Simple merge

diff --cc arch/powerpc/include/asm/book3s/64/pgtable.h
Simple merge

diff --cc arch/powerpc/include/asm/mmu_context.h
Simple merge

diff --cc arch/powerpc/kernel/mce.c
Simple merge

diff --cc arch/powerpc/kernel/module_64.c
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/rtasd.c
Simple merge

diff --cc arch/powerpc/kernel/setup-common.c
Simple merge

diff --cc arch/powerpc/kernel/signal_32.c
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc arch/powerpc/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/file.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/spufs.h
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/iommu.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_pci.c
Simple merge

diff --cc drivers/misc/Kconfig
index 6722073e339baea8863db71c217c2565212aa52a,0534f338c84a688fa1c26622a74098f6b7c9ccd0..03605f8fc0dc94490f9ee76fb69ec68c22528ec7
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -512,5 -508,5 +512,6 @@@ source "drivers/misc/mic/Kconfig
  source "drivers/misc/genwqe/Kconfig"
  source "drivers/misc/echo/Kconfig"
  source "drivers/misc/cxl/Kconfig"
+ source "drivers/misc/ocxl/Kconfig"
 +source "drivers/misc/cardreader/Kconfig"
  endmenu

diff --cc drivers/misc/Makefile
index 8d8cc096063bde0a75b9c0854dcbdeb787630479,73326d54e246775b1496459a93098d05cc8d3b4f..c3c8624f4d9506efe0f21168a3ebf7c0ae4536ee
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -55,7 -55,7 +55,8 @@@ obj-$(CONFIG_CXL_BASE)                += cxl
  obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o
  obj-$(CONFIG_ASPEED_LPC_SNOOP)        += aspeed-lpc-snoop.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)       += pci_endpoint_test.o
- obj-$(CONFIG_MISC_RTSX)       += cardreader/
+ obj-$(CONFIG_OCXL)            += ocxl/
++obj-$(CONFIG_MISC_RTSX)               += cardreader/
  
  lkdtm-$(CONFIG_LKDTM)         += lkdtm_core.o
  lkdtm-$(CONFIG_LKDTM)         += lkdtm_bugs.o

diff --cc drivers/misc/cxl/cxl.h
Simple merge

diff --cc drivers/misc/cxl/file.c
Simple merge

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