linux-next: manual merge of the pci tree with the arm-soc tree

Hi all, Today's linux-next merge of the pci tree got a conflict in: drivers/bus/Makefile between commit: 1888d3ddc3d6 ("drivers/bus: Move Arm CCN PMU driver") from the arm-soc tree and commit: 38e3446c5d06 ("HISI LPC: Support the LPC host on Hip06/Hip07 with DT bindings") from the pci

linux-next: manual merge of the pci tree with the arm-soc tree

Hi Bjorn, Today's linux-next merge of the pci tree got a conflict in: drivers/pci/host/Kconfig between commit: 70d334ca71b0 ("PCI: iproc: Fix BCMA dependency in Kconfig") from the arm-soc tree and commit: 05aa7d6a72c1 ("PCI: iproc: Allow BCMA bus driver to be built as module") from the