Merge branch 'pci/msi-affinity' into next

Conflicts:
	drivers/nvme/host/pci.c
This commit is contained in:
Bjorn Helgaas
2016-08-01 12:34:01 -05:00
1008 changed files with 10024 additions and 6416 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ extern void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd);
#define pgd_alloc(mm) get_pgd_slow(mm)
#define pgd_free(mm, pgd) free_pgd_slow(mm, pgd)
#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)
#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)
/*
* Allocate one PTE table.