Merge branch 'pci/feng-avoid-kmalloc' into next