Merge tag 'powerpc-4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

Pull powerpc fixes from Michael Ellerman:
 - eeh: Fix partial hotplug criterion from Gavin Shan
 - mm: Clear the invalid slot information correctly from Aneesh Kumar K.V

* tag 'powerpc-4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/mm/hash: Clear the invalid slot information correctly
  powerpc/eeh: Fix partial hotplug criterion

diff --combined arch/powerpc/kernel/eeh_driver.c
index 301be3126ae3e1bcbe6b3f8aabce07d2416c89e9,52c1e273f8cd5d5d641e1f2bc7591ff8b0efdbd9..650cfb31ea3d9b3cee0301948bd85e54400cb951
--- 1/arch/powerpc/kernel/eeh_driver.c
--- 2/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@@ -400,7 -400,7 +400,7 @@@ static void *eeh_rmv_device(void *data
         * support EEH. So we just care about PCI devices for
         * simplicity here.
         */
 -      if (!dev || (dev->hdr_type & PCI_HEADER_TYPE_BRIDGE))
 +      if (!dev || (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE))
                return NULL;
  
        /*
@@@ -418,8 -418,7 +418,7 @@@
                eeh_pcid_put(dev);
                if (driver->err_handler &&
                    driver->err_handler->error_detected &&
-                   driver->err_handler->slot_reset &&
-                   driver->err_handler->resume)
+                   driver->err_handler->slot_reset)
                        return NULL;
        }