The following commit has been merged in the master branch: commit 0734e00ef9e48e78c5c3ce1648572f160d07e323 Merge: 4608f064532c28c0ea3c03fe26a3a5909852811a 615b2665fd20c327b631ff1e79426775de748094 Author: Linus Torvalds torvalds@linux-foundation.org Date: Tue Apr 3 15:48:04 2018 -0700

Merge branch 'parisc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc updates from Helge Deller: "Lots of small enhancements and fixes in this patchset:

- improved the x86-64 compatibility for PCI cards by returning -1UL for timed out MMIO transactions (instead of crashing)

- fixed HPMC handler for PAT machines: size needs to be multiple of 16

- prepare machine_power_off() to be able to turn rp3410 and c8000 machines off via IMPI

- added code to extract machine info for usage with qemu

- some init sections fixes

- lots of fixes for sparse-, ubsan- and uninitalized variables warnings"

* 'parisc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Fix out of array access in match_pci_device() parisc: Add code generator for Qemu/SeaBIOS machine info parisc/pci: Switch LBA PCI bus from Hard Fail to Soft Fail mode parisc: Fix HPMC handler by increasing size to multiple of 16 bytes parisc: Directly call machine_power_off() in power button driver parisc: machine_power_off() should call pm_power_off() parisc/Kconfig: SMP kernels boot on all machines parisc: Silence uninitialized variable warning in dbl_to_sgl_fcnvff() parisc: Move various functions and strings to init section parisc: Convert MAP_TYPE to cover 4 bits on parisc parisc: Force to various endian types for sparse parisc/gscps2: Fix sparse warnings parisc/led: Fix sparse warnings parisc/parport_gsc: Use NULL to avoid sparse warning parisc/stifb: Use fb_memset() to avoid sparse warning