Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1341198

linux-next: manual merge of the pci tree with the pci-current tree

Show all headers | View raw

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 pci tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/probe.c
index 1e34d211389a,5eb378fbe849..000000000000
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -15,8 -15,6 +15,7 @@@
  #include <linux/pci-aspm.h>
  #include <linux/aer.h>
  #include <linux/acpi.h>
 +#include <linux/irqdomain.h>
- #include <asm-generic/pci-bridge.h>
  #include "pci.h"
  
  #define CARDBUS_LATENCY_TIMER	176	/* secondary latency timer */

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the pci tree with the pci-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-24 01:10 +0100

csiph-web