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

Pull more s390 updates from Martin Schwidefsky:
 "The big thing in this second merge for s390 is the new eBPF JIT from
  Michael which replaces the old 32-bit backend.

  The remaining commits are bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: add locking for fmb access
  s390/pci: extract software counters from fmb
  s390/dasd: Fix unresumed device after suspend/resume having no paths
  s390/dasd: fix unresumed device after suspend/resume
  s390/dasd: fix inability to set a DASD device offline
  s390/mm: Fix memory hotplug for unaligned standby memory
  s390/bpf: Add s390x eBPF JIT compiler backend
  s390: Use bool function return values of true/false not 1/0

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/pci/pci_debug.c
index c22d440,3fc9b4d..4129b0a
--- 1/arch/s390/pci/pci_debug.c
--- 2/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@@ -45,9 -58,11 +58,12 @@@ static int pci_perf_show(struct seq_fil
  
        if (!zdev)
                return 0;
+ 
+       mutex_lock(&zdev->lock);
        if (!zdev->fmb) {
 -              return seq_printf(m, "FMB statistics disabled\n");
+               mutex_unlock(&zdev->lock);
 +              seq_puts(m, "FMB statistics disabled\n");
 +              return 0;
        }
  
        /* header */