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)
commit1974704eadb221f0e827e05989fe569ec7049a71
treeb2798318a8ff656bfb21de8038add0e24783a19d
parent0c38011aba35b2cdca263c0ba4d28e2e727b5acb
parent7403bd14d7b545ef89c3443c09ccdb3c631a9a27
Merge branch 'remotes/lorenzo/pci/hv'

  - 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()
drivers/pci/controller/pci-hyperv.c