Merge branch 'pci/aer' into next

* pci/aer:
  PCI/AER: Report non-fatal errors only to the affected endpoint

drivers/pci/pcie/aer/aerdrv_core.c

@@ -390,6 +390,13 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,
 		 * If the error is reported by an end point, we think this
 		 * error is related to the upstream link of the end point.
 		 */
+		if (state == pci_channel_io_normal)
+			/*
+			 * the error is non fatal so the bus is ok, just invoke
+			 * the callback for the function that logged the error.
+			 */
+			cb(dev, &result_data);
+		else
 			pci_walk_bus(dev->bus, cb, &result_data);
 	}