From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 12 Mar 2024 17:14:21 +0000 (-0500)
Subject: Merge branch 'pci/enumeration'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=420b8c36069587abf77d2b51fbaa24e9fc5dda67;p=linux.git

Merge branch 'pci/enumeration'

-  Collect interrupt-related code in irq.c (Ilpo Järvinen)

- Mark 3ware-9650SE Root Port Extended Tags as broken (Jörg Wedekind)

* pci/enumeration:
  PCI: Mark 3ware-9650SE Root Port Extended Tags as broken
  PCI: Place interrupt related code into irq.c

# Conflicts:
#	drivers/pci/Makefile
---

420b8c36069587abf77d2b51fbaa24e9fc5dda67
diff --cc drivers/pci/Makefile
index ed65299b42b54,54a7adf0bb88c..147779831b130
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -5,7 -5,7 +5,7 @@@
  obj-$(CONFIG_PCI)		+= access.o bus.o probe.o host-bridge.o \
  				   remove.o pci.o pci-driver.o search.o \
  				   pci-sysfs.o rom.o setup-res.o irq.o vpd.o \
- 				   setup-bus.o vc.o mmap.o setup-irq.o devres.o
 -				   setup-bus.o vc.o mmap.o
++				   setup-bus.o vc.o mmap.o devres.o
  
  obj-$(CONFIG_PCI)		+= msi/
  obj-$(CONFIG_PCI)		+= pcie/