]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'remotes/lorenzo/pci/hv'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:59:12 +0000 (14:59 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:59:12 +0000 (14:59 -0500)
  - Remove unnecessary GFP_ATOMIC from Hyper-V "new child" allocation
    (Jia-Ju Bai)

* remotes/lorenzo/pci/hv:
  PCI: hv: Replace GFP_ATOMIC with GFP_KERNEL in new_pcichild_device()

1  2 
drivers/pci/controller/pci-hyperv.c

Simple merge