Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/pci.h
between commit:
44bda4b7d26e ("PCI: Fix is_added/is_busmaster race condition")
from the pci-current tree and commit:
1e4511604dfa ("PCI/AER: Expose internal API for obtaining AER information")
from
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/pci.h
between commit:
44bda4b7d26e ("PCI: Fix is_added/is_busmaster race condition")
from the pci-current tree and commit:
1e4511604dfa ("PCI/AER: Expose internal API for obtaining AER information")
from
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/probe.c
between commit:
788858ebc49a ("PCI: Look up IRQ domain by fwnode_handle")
from the pci-current tree and commit:
5bd28338d681 ("PCI: Remove includes of empty asm-generic/pci-bridge.h")
from the
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/pci/probe.c
between commit:
788858ebc49a ("PCI: Look up IRQ domain by fwnode_handle")
from the pci-current tree and commit:
5bd28338d681 ("PCI: Remove includes of empty asm-generic/pci-bridge.h")
from the
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in drivers/pci/pci.c
between commit 5f4fe7ad54087 ("PCI: Enable INTx in pci_reenable_device() only
when MSI/MSI-X not enabled") from the pci-current tree and commit
1e2571a7813836 ("PCI: Enable INTx if BIOS left them disabled")
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in drivers/pci/pci.c
between commit 5f4fe7ad54087 (PCI: Enable INTx in pci_reenable_device() only
when MSI/MSI-X not enabled) from the pci-current tree and commit
1e2571a7813836 (PCI: Enable INTx if BIOS left them disabled) from
6 matches
Mail list logo