Merge remote-tracking branch 's390/features'

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

diff --cc arch/s390/pci/pci_event.c
index 069607209a3075c6f4ff2c62fe91b7eb1d99c8aa,7fc4c2c5708c8b5668e4fe6f99376bbda46280df..01e251b1da0cb82c6ecc263fcd5474c19c34d28d
--- 1/arch/s390/pci/pci_event.c
--- 2/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@@ -99,10 -102,13 +103,14 @@@ static void __zpci_event_availability(s
  
                break;
        case 0x0304: /* Configured -> Standby */
-               if (pdev)
+               if (pdev) {
+                       /* Give the driver a hint that the function is
+                        * already unusable. */
+                       pdev->error_state = pci_channel_io_perm_failure;
                        pci_stop_and_remove_bus_device(pdev);
+               }
  
 +              zdev->fh = ccdf->fh;
                zpci_disable_device(zdev);
                zdev->state = ZPCI_FN_STATE_STANDBY;
                break;

diff --cc drivers/s390/char/tty3270.c
Simple merge