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

Pull s390 updates from Martin Schwidefsky:

 - A couple of patches for the zcrypt driver:
     + Add two masks to determine which AP cards and queues are host
       devices, this will be useful for KVM AP device passthrough
     + Add-on patch to improve the parsing of the new apmask and aqmask
     + Some code beautification

 - Second try to reenable the GCC plugins, the first patch set had a
   patch to do this but the merge somehow missed this

 - Remove the s390 specific GCC version check and use the generic one

 - Three patches for kdump, two bug fixes and one cleanup

 - Three patches for the PCI layer, one bug fix and two cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: remove gcc version check (4.3 or newer)
  s390/zcrypt: hex string mask improvements for apmask and aqmask.
  s390/zcrypt: AP bus support for alternate driver(s)
  s390/zcrypt: code beautify
  s390/zcrypt: switch return type to bool for ap_instructions_available()
  s390/kdump: Remove kzalloc_panic
  s390/kdump: Fix memleak in nt_vmcoreinfo
  s390/kdump: Make elfcorehdr size calculation ABI compliant
  s390/pci: remove fmb address from debug output
  s390/pci: remove stale rc
  s390/pci: fix out of bounds access during irq setup
  s390/zcrypt: fix ap_instructions_available() returncodes
  s390: reenable gcc plugins for real

diff --combined arch/s390/Kconfig
index 054b29c9a533aa9d89189fd5307e3186fabbe402,4b3476d785f7430dfdf5519b194c451345a14405..9a9c7a6fe925915f561dd48c454e1e02d5ee7a51
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -135,12 -135,11 +135,12 @@@ config S39
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
 +      select HAVE_FENTRY
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
        select HAVE_FUTEX_CMPXCHG if FUTEX
-       select HAVE_GCC_PLUGINS if BROKEN
+       select HAVE_GCC_PLUGINS
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZ4
@@@ -158,7 -157,6 +158,7 @@@
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_MEMBLOCK_PHYS_MAP
        select HAVE_MOD_ARCH_SPECIFIC
 +      select HAVE_NOP_MCOUNT
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select HAVE_REGS_AND_STACK_ACCESS_API
@@@ -186,6 -184,10 +186,6 @@@ config PGTABLE_LEVEL
        int
        default 5
  
 -source "init/Kconfig"
 -
 -source "kernel/Kconfig.freezer"
 -
  source "kernel/livepatch/Kconfig"
  
  menu "Processor type and features"
@@@ -513,6 -515,8 +513,6 @@@ config SCHED_TOPOLOG
          making when dealing with machines that have multi-threading,
          multiple cores or multiple books.
  
 -source kernel/Kconfig.preempt
 -
  source kernel/Kconfig.hz
  
  config KEXEC
@@@ -623,6 -627,8 +623,6 @@@ config FORCE_MAX_ZONEORDE
        int
        default "9"
  
 -source "mm/Kconfig"
 -
  config MAX_PHYSMEM_BITS
        int "Maximum size of supported physical memory in bits (42-53)"
        range 42 53
@@@ -792,6 -798,10 +792,6 @@@ config CRASH_DUM
  
  endmenu
  
 -menu "Executable file formats / Emulations"
 -
 -source "fs/Kconfig.binfmt"
 -
  config SECCOMP
        def_bool y
        prompt "Enable seccomp to safely compute untrusted bytecode"
@@@ -809,6 -819,8 +809,6 @@@
  
          If unsure, say Y.
  
 -endmenu
 -
  menu "Power Management"
  
  config ARCH_HIBERNATION_POSSIBLE
@@@ -818,16 -830,30 +818,16 @@@ source "kernel/power/Kconfig
  
  endmenu
  
 -source "net/Kconfig"
 -
  config PCMCIA
        def_bool n
  
  config CCW
        def_bool y
  
 -source "drivers/Kconfig"
 -
  config HAVE_PNETID
        tristate
        default (SMC || CCWGROUP)
  
 -source "fs/Kconfig"
 -
 -source "arch/s390/Kconfig.debug"
 -
 -source "security/Kconfig"
 -
 -source "crypto/Kconfig"
 -
 -source "lib/Kconfig"
 -
  menu "Virtualization"
  
  config PFAULT