Merge branch 'pci/msi-affinity' into next

Conflicts: drivers/nvme/host/pci.c
2016-08-01 12:34:01 -05:00
parent a04bee8285 4ef33685aa
commit 9454c23852
1008 changed files with 10024 additions and 6416 deletions
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -242,7 +242,7 @@ unsigned int irq_alloc(unsigned int dev_handle, unsigned int dev_ino)
 {
 	int irq;

-	irq = __irq_alloc_descs(-1, 1, 1, numa_node_id(), NULL);
+	irq = __irq_alloc_descs(-1, 1, 1, numa_node_id(), NULL, NULL);
 	if (irq <= 0)
 		goto out;