Merge branch 'features' into for-next

* features:
  s390/mm: Remove have_store_indication static key
  s390: Sort mcount locations at build time
  s390/vfio-ap: Signal eventfd when guest AP configuration is changed
  s390/vfio-ccw: Make mdev_types not look like a fake flex array
  s390/vfio-ap: Make mdev_types not look like a fake flex array
  s390/cio: Remove outdated email address
  s390/vfio-ap: Fix indentation in vfio_ap_mdev_ioctl()

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

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