linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  include/linux/of_pci.h

between commit:

  a6f1086e29e9 ("PCI: Move of_irq_parse_and_map_pci() declaration under OF_IRQ")

from Linus' tree and commit:

  effab67ffe90 ("PCI: Move private DT related functions into private header")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/of_pci.h
index 091033a6b836,41155181ecbd..000000000000
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@@ -13,9 -13,7 +13,6 @@@ struct device_node
  struct device_node *of_pci_find_child_device(struct device_node *parent,
  					     unsigned int devfn);
  int of_pci_get_devfn(struct device_node *np);
- int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
- int of_get_pci_domain_nr(struct device_node *node);
- int of_pci_get_max_link_speed(struct device_node *node);
 -int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
  void of_pci_check_probe_only(void);
  int of_pci_map_rid(struct device_node *np, u32 rid,
  		   const char *map_name, const char *map_mask_name,
@@@ -32,18 -30,12 +29,6 @@@ static inline int of_pci_get_devfn(stru
  	return -EINVAL;
  }
  
- static inline int
- of_pci_parse_bus_range(struct device_node *node, struct resource *res)
- {
- 	return -EINVAL;
- }
- 
--static inline int
- of_get_pci_domain_nr(struct device_node *node)
 -of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
--{
- 	return -1;
 -	return 0;
--}
--
  static inline int of_pci_map_rid(struct device_node *np, u32 rid,
  			const char *map_name, const char *map_mask_name,
  			struct device_node **target, u32 *id_out)
@@@ -54,33 -46,4 +39,13 @@@
  static inline void of_pci_check_probe_only(void) { }
  #endif
  
 +#if IS_ENABLED(CONFIG_OF_IRQ)
 +int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
 +#else
 +static inline int
 +of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
 +{
 +	return 0;
 +}
 +#endif
- 
- #if defined(CONFIG_OF_ADDRESS)
- int of_pci_get_host_bridge_resources(struct device_node *dev,
- 			unsigned char busno, unsigned char bus_max,
- 			struct list_head *resources, resource_size_t *io_base);
- #else
- static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
- 			unsigned char busno, unsigned char bus_max,
- 			struct list_head *resources, resource_size_t *io_base)
- {
- 	return -EINVAL;
- }
- #endif
- 
  #endif

Attachment: pgpqKesk6fplq.pgp
Description: OpenPGP digital signature