Merge tag 's390-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Vasily Gorbik:

 - Update maintainers. Niklas Schnelle takes over zpci and Vineeth
   Vijayan common io code.

 - Extend cpuinfo to include topology information.

 - Add new extended counters for IBM z15 and sampling buffer allocation
   rework in perf code.

 - Add control over zeroing out memory during system restart.

 - CCA protected key block version 2 support and other
   fixes/improvements in crypto code.

 - Convert to new fallthrough; annotations.

 - Replace zero-length arrays with flexible-arrays.

 - QDIO debugfs and other small improvements.

 - Drop 2-level paging support optimization for compat tasks. Varios mm
   cleanups.

 - Remove broken and unused hibernate / power management support.

 - Remove fake numa support which does not bring any benefits.

 - Exclude offline CPUs from CPU topology masks to be more consistent
   with other architectures.

 - Prevent last branching instruction address leaking to userspace.

 - Other small various fixes and improvements all over the code.

* tag 's390-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (57 commits)
  s390/mm: cleanup init_new_context() callback
  s390/mm: cleanup virtual memory constants usage
  s390/mm: remove page table downgrade support
  s390/qdio: set qdio_irq->cdev at allocation time
  s390/qdio: remove unused function declarations
  s390/ccwgroup: remove pm support
  s390/ap: remove power management code from ap bus and drivers
  s390/zcrypt: use kvmalloc instead of kmalloc for 256k alloc
  s390/mm: cleanup arch_get_unmapped_area() and friends
  s390/ism: remove pm support
  s390/cio: use fallthrough;
  s390/vfio: use fallthrough;
  s390/zcrypt: use fallthrough;
  s390: use fallthrough;
  s390/cpum_sf: Fix wrong page count in error message
  s390/diag: fix display of diagnose call statistics
  s390/ap: Remove ap device suspend and resume callbacks
  s390/pci: Improve handling of unset UID
  s390/pci: Fix zpci_alloc_domain() over allocation
  s390/qdio: pass ISC as parameter to chsc_sadc()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/configs/debug_defconfig
Simple merge

diff --cc arch/s390/configs/defconfig
Simple merge

diff --cc arch/s390/include/asm/mmu.h
Simple merge

diff --cc arch/s390/include/asm/mmu_context.h
index afa8360,844396b..c9f3d8a
--- 1/arch/s390/include/asm/mmu_context.h
--- 2/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@@ -23,10 -25,8 +25,9 @@@ static inline int init_new_context(stru
        INIT_LIST_HEAD(&mm->context.gmap_list);
        cpumask_clear(&mm->context.cpu_attach_mask);
        atomic_set(&mm->context.flush_count, 0);
 +      atomic_set(&mm->context.is_protected, 0);
        mm->context.gmap_asce = 0;
        mm->context.flush_mm = 0;
-       mm->context.compat_mm = test_thread_flag(TIF_31BIT);
  #ifdef CONFIG_PGSTE
        mm->context.alloc_pgste = page_table_allocate_pgste ||
                test_thread_flag(TIF_PGSTE) ||

diff --cc arch/s390/include/asm/page.h
Simple merge

diff --cc arch/s390/include/asm/processor.h
Simple merge

diff --cc arch/s390/kernel/Makefile
Simple merge

diff --cc arch/s390/kernel/setup.c
Simple merge

diff --cc arch/s390/mm/fault.c
Simple merge

diff --cc arch/s390/pci/pci.c
Simple merge

diff --cc drivers/s390/cio/qdio.h
Simple merge

diff --cc drivers/s390/cio/qdio_debug.c
Simple merge

diff --cc drivers/s390/cio/qdio_main.c
Simple merge

diff --cc drivers/s390/cio/qdio_setup.c
index 7b831bb,e1b7a91..bbbefc9
--- 1/drivers/s390/cio/qdio_setup.c
--- 2/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@@ -469,18 -471,10 +470,17 @@@ int qdio_setup_irq(struct qdio_irq *irq
        irq_ptr->int_parm = init_data->int_parm;
        irq_ptr->nr_input_qs = init_data->no_input_qs;
        irq_ptr->nr_output_qs = init_data->no_output_qs;
-       irq_ptr->cdev = init_data->cdev;
        irq_ptr->scan_threshold = init_data->scan_threshold;
-       ccw_device_get_schid(irq_ptr->cdev, &irq_ptr->schid);
+       ccw_device_get_schid(cdev, &irq_ptr->schid);
        setup_queues(irq_ptr, init_data);
  
 +      if (init_data->irq_poll) {
 +              irq_ptr->irq_poll = init_data->irq_poll;
 +              set_bit(QDIO_IRQ_DISABLED, &irq_ptr->poll_state);
 +      } else {
 +              irq_ptr->irq_poll = NULL;
 +      }
 +
        setup_qib(irq_ptr, init_data);
        qdio_setup_thinint(irq_ptr);
        set_impl_params(irq_ptr, init_data->qib_param_field_format,

diff --cc drivers/s390/cio/qdio_thinint.c
Simple merge

diff --cc drivers/s390/crypto/zcrypt_ep11misc.c
Simple merge

diff --cc kernel/power/snapshot.c
Simple merge