Merge branch 'features' into for-next

Merge branch 'features' into for-next

* features:
  s390/test_unwind: add WARN if tests failed
  s390/test_unwind: unify error handling paths
  s390: update defconfigs
  s390/spinlock: use R constraint in inline assembly
  s390/atomic,cmpxchg: switch to use atomic-instrumented.h
  s390/cmpxchg: get rid of gcc atomic builtins
  s390/atomic: get rid of gcc atomic builtins
  s390/atomic: use proper constraints
  s390/atomic: move remaining inline assemblies to atomic_ops.h
  s390/bitops: make bitops only work on longs
  s390/traps,mm: add conditional trap handlers
  s390/pci: narrow scope of zpci_configure_device()
  s390/pci: separate zbus registration from scanning
  s390/pci: use mutex not spinlock for zbus list
  s390/pci: separate zbus creation from scanning
  s390/pci: do more bus setup in zpci_bus_scan()
  s390/pci: introduce zpci_bus_scan_device()
  s390/traps: convert pgm_check.S to C
  s390/cio: use DECLARE_WAIT_QUEUE_HEAD for static work_queue_head_t
  s390/protvirt: fix error return code in uv_info_init()
  s390/sclp: use LIST_HEAD for Initialization
  s390: use DEFINE_SPINLOCK for initialization
  s390/mm: fix phys vs virt confusion in mark_kernel_pXd() functions family
  s390/vfio-ap: fix circular lockdep when setting/clearing crypto masks
  s390/cio: remove duplicate struct ccw1 declaration
  s390/cio: use DECLARE_WAIT_QUEUE_HEAD() for wait_queue
  s390/cio: use DEFINE_SPINLOCK() for spinlock
  s390/pci: expose UID uniqueness guarantee
  s390/pci: fix DMA cleanup on hard deconfigure
  s390/spinlock: remove align attribute from arch_spinlock_t
  s390/crc32-vx: couple of typo fixes
  s390/uv: fix prot virt host indication compilation
  s390/kernel: fix a typo
  s390/qdio: let driver manage the QAOB
  s390/pci: move zpci_remove_device() to bus code
  s390/pci: unify de-/configure for slots and events
  s390/cio: add CRW inject functionality
  s390/cio: introduce CIO debugfs directory
  s390/pci: add zpci_event_hard_deconfigured()
  s390/pci: deconfigure device on release
  s390/pci: refactor zpci function states
  s390/sclp: increase sclp console line length
  s390/uv: add prot virt guest/host indication files

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>