Merge branch 'pci/misc'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Dec 2020 21:11:08 +0000 (15:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Dec 2020 21:11:08 +0000 (15:11 -0600)
commit6db645f99cc5357ab5520982b85396487c113dc9
tree0431721fd4cc7b3814371aa734c0b6cfa439be36
parent1a76dceaf4268f904292ca126d1cb9af091fd516
parent0aec75a5963e8d72c59a42055c5b5c524893b910
Merge branch 'pci/misc'

- Update kernel-doc to match function prototypes (Mauro Carvalho Chehab)

- Bounds-check "pci=resource_alignment=" requests (Bjorn Helgaas)

- Fix integer overflow in "pci=resource_alignment=" requests (Colin Ian
  King)

- Remove unused HAVE_PCI_SET_MWI definition (Heiner Kallweit)

- Reduce pci_set_cacheline_size() message to debug level (Heiner Kallweit)

* pci/misc:
  PCI: Reduce pci_set_cacheline_size() message to debug level
  PCI: Remove unused HAVE_PCI_SET_MWI
  PCI: Fix overflow in command-line resource alignment requests
  PCI: Bounds-check command-line resource alignment requests
  PCI: Fix kernel-doc markup

# Conflicts:
# drivers/pci/pci-driver.c
drivers/pci/pci-driver.c
drivers/pci/pci.c
drivers/pci/probe.c
drivers/pci/slot.c
include/linux/pci.h