Commit 3de91486 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Drop 'pci' suffix from intel_mid_pci.c filename to match similar files
  (Andy Shevchenko)

- All platforms with PCI have an MMU, so add PCI Kconfig dependency on MMU
  to simplify build testing and avoid inadvertent build regressions (Arnd
  Bergmann)

- Update driver path in PCI NVMe function documentation (Rick Wertenbroek)

- Remove unused pci_printk() (Ilpo Järvinen)

- Warn (not BUG()) about failure to assign optional resources (Ilpo
  Järvinen)

- Update Krzysztof Wilczyński's email address in MAINTAINERS (Krzysztof
  Wilczyński)

- Update Manivannan Sadhasivam's email address in MAINTAINERS (Manivannan
  Sadhasivam)

* pci/misc:
  MAINTAINERS: Update Manivannan Sadhasivam email address
  MAINTAINERS: Update Krzysztof Wilczyński email address
  PCI: Remove unnecessary linesplit in __pci_setup_bridge()
  PCI: WARN (not BUG()) when we fail to assign optional resources
  PCI: Remove unused pci_printk()
  Documentation: Fix path for NVMe PCI endpoint target driver
  PCI: Add CONFIG_MMU dependency
  x86/PCI: Drop 'pci' suffix from intel_mid_pci.c
parents 27b1aac5 308f8c7a

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -413,6 +413,8 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org> 
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>

Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>

Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
@@ -451,6 +453,7 @@ Maheshwar Ajja <quic_majja@quicinc.com> <majja@codeaurora.org> 
Malathi Gottam <quic_mgottam@quicinc.com> <mgottam@codeaurora.org>

Manikanta Pubbisetty <quic_mpubbise@quicinc.com> <mpubbise@codeaurora.org>

Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>

Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>

Manoj Basapathi <quic_manojbm@quicinc.com> <manojbm@codeaurora.org>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Documentation/PCI/endpoint/pci-nvme-function.rst

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ PCI NVMe Function 


The PCI NVMe endpoint function implements a PCI NVMe controller using the NVMe

subsystem target core code. The driver for this function resides with the NVMe

subsystem as drivers/nvme/target/nvmet-pciep.c.

subsystem as drivers/nvme/target/pci-epf.c.



See Documentation/nvme/nvme-pci-endpoint-target.rst for more details.

MAINTAINERS

+22 −22
Original line number Diff line number Diff line
@@ -2102,7 +2102,7 @@ F: arch/arm/plat-*/ 








ARM/ACTIONS SEMI ARCHITECTURE









M:	Andreas Färber <afaerber@suse.de>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-actions@lists.infradead.org (moderated for non-subscribers)









S:	Maintained








@@ -2354,7 +2354,7 @@ F:	arch/arm/boot/dts/intel/axm/







F:	arch/arm/mach-axxia/

















ARM/BITMAIN ARCHITECTURE









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	Documentation/devicetree/bindings/arm/bitmain.yaml








@@ -3021,7 +3021,7 @@ F:	include/linux/soc/qcom/







F:	include/soc/qcom/

















ARM/RDA MICRO ARCHITECTURE









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-unisoc@lists.infradead.org (moderated for non-subscribers)









S:	Maintained








@@ -3718,7 +3718,7 @@ F:	Documentation/admin-guide/aoe/







F:	drivers/block/aoe/

















ATC260X PMIC MFD DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









M:	Cristian Ciocaltea <cristian.ciocaltea@gmail.com>









L:	linux-actions@lists.infradead.org









S:	Maintained








@@ -6721,7 +6721,7 @@ S:	Orphan







F:	drivers/mtd/nand/raw/denali*

















DESIGNWARE EDMA CORE IP DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	dmaengine@vger.kernel.org









S:	Maintained









F:	drivers/dma/dw-edma/








@@ -8536,7 +8536,7 @@ S:	Maintained







F:	drivers/edac/pnd2_edac.[ch]

















EDAC-QCOM









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-arm-msm@vger.kernel.org









L:	linux-edac@vger.kernel.org









S:	Maintained








@@ -12120,7 +12120,7 @@ M:	Andy Shevchenko <andy@kernel.org>







L:	linux-kernel@vger.kernel.org









S:	Supported









F:	arch/x86/include/asm/intel-mid.h









F:	arch/x86/pci/intel_mid_pci.c









F:	arch/x86/pci/intel_mid.c









F:	arch/x86/platform/intel-mid/









F:	drivers/dma/hsu/









F:	drivers/extcon/extcon-intel-mrfld.c








@@ -14664,7 +14664,7 @@ F:	drivers/hid/hid-mcp2221.c















MCP251XFD SPI-CAN NETWORK DRIVER









M:	Marc Kleine-Budde <mkl@pengutronix.de>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









R:	Thomas Kopp <thomas.kopp@microchip.com>









L:	linux-can@vger.kernel.org









S:	Maintained








@@ -15644,7 +15644,7 @@ F:	arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts







F:	arch/arm64/boot/dts/marvell/armada-3720-uDPU.*

















MHI BUS









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	mhi@lists.linux.dev









L:	linux-arm-msm@vger.kernel.org









S:	Maintained








@@ -18546,7 +18546,7 @@ F:	drivers/pci/controller/dwc/pci-exynos.c















PCI DRIVER FOR SYNOPSYS DESIGNWARE









M:	Jingoo Han <jingoohan1@gmail.com>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-pci@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml








@@ -18581,8 +18581,8 @@ F:	Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml







F:	drivers/pci/controller/pcie-xilinx-cpm.c

















PCI ENDPOINT SUBSYSTEM









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Krzysztof Wilczyński <kw@linux.com>









M:	Manivannan Sadhasivam <mani@kernel.org>









M:	Krzysztof Wilczyński <kwilczynski@kernel.org>









R:	Kishon Vijay Abraham I <kishon@kernel.org>









L:	linux-pci@vger.kernel.org









S:	Supported








@@ -18633,8 +18633,8 @@ F:	drivers/pci/controller/pci-xgene-msi.c















PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>









M:	Krzysztof Wilczyński <kw@linux.com>









R:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Krzysztof Wilczyński <kwilczynski@kernel.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









R:	Rob Herring <robh@kernel.org>









L:	linux-pci@vger.kernel.org









S:	Supported








@@ -18781,7 +18781,7 @@ F:	Documentation/devicetree/bindings/pci/microchip*







F:	drivers/pci/controller/plda/*microchip*

















PCIE DRIVER FOR QUALCOMM MSM









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-pci@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained








@@ -18817,7 +18817,7 @@ F:	Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml







F:	drivers/pci/controller/plda/pcie-starfive.c

















PCIE ENDPOINT DRIVER FOR QUALCOMM









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-pci@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained








@@ -19935,7 +19935,7 @@ F:	drivers/iommu/arm/arm-smmu/arm-smmu-qcom*







F:	drivers/iommu/msm_iommu*

















QUALCOMM IPC ROUTER (QRTR) DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	include/trace/events/qrtr.h








@@ -19943,7 +19943,7 @@ F:	include/uapi/linux/qrtr.h







F:	net/qrtr/

















QUALCOMM IPCC MAILBOX DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-arm-msm@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml








@@ -19977,7 +19977,7 @@ F:	Documentation/devicetree/bindings/media/qcom,*-iris.yaml







F:	drivers/media/platform/qcom/iris/

















QUALCOMM NAND CONTROLLER DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-mtd@lists.infradead.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained








@@ -22512,7 +22512,7 @@ F:	Documentation/devicetree/bindings/media/i2c/sony,imx283.yaml







F:	drivers/media/i2c/imx283.c

















SONY IMX290 SENSOR DRIVER









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-media@vger.kernel.org









S:	Maintained









T:	git git://linuxtv.org/media.git








@@ -22521,7 +22521,7 @@ F:	drivers/media/i2c/imx290.c















SONY IMX296 SENSOR DRIVER









M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-media@vger.kernel.org









S:	Maintained









T:	git git://linuxtv.org/media.git








@@ -24817,7 +24817,7 @@ S:	Maintained







F:	drivers/ufs/host/ufs-mediatek*

















UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER QUALCOMM HOOKS









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Manivannan Sadhasivam <mani@kernel.org>









L:	linux-arm-msm@vger.kernel.org









L:	linux-scsi@vger.kernel.org









S:	Maintained

























arch/x86/pci/Makefile



+3
−3






























Original line number
Diff line number
Diff line







@@ -8,13 +8,13 @@ obj-$(CONFIG_PCI_OLPC)		+= olpc.o







obj-$(CONFIG_PCI_XEN)		+= xen.o



















obj-y				+= fixup.o









obj-$(CONFIG_X86_INTEL_CE)      += ce4100.o









obj-$(CONFIG_ACPI)		+= acpi.o









obj-y				+= legacy.o irq.o



















obj-$(CONFIG_X86_NUMACHIP)	+= numachip.o









obj-$(CONFIG_X86_INTEL_CE)	+= ce4100.o









obj-$(CONFIG_X86_INTEL_MID)	+= intel_mid.o



















obj-$(CONFIG_X86_INTEL_MID)	+= intel_mid_pci.o









obj-$(CONFIG_X86_NUMACHIP)	+= numachip.o



















obj-y				+= common.o early.o









obj-y				+= bus_numa.o