Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: include/linux/gpio/driver.h between commit: fdd61a013a24 ("gpio: Add support for hierarchical IRQ domains") from the gpio tree and commit: 9091373ab7ea ("gpio: remove less important #ifdef around declarations") from the gpio-brgl 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/gpio/driver.h index 0e6d3b0c0211,f28f534f451a..000000000000 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@@ -20,12 -20,6 +20,8 @@@ struct module enum gpiod_flags; enum gpio_lookup_flags; - #ifdef CONFIG_GPIOLIB - - #ifdef CONFIG_GPIOLIB_IRQCHIP - +struct gpio_chip; + /** * struct gpio_irq_chip - GPIO interrupt controller */ @@@ -530,38 -443,6 +523,36 @@@ struct bgpio_pdata int ngpio; }; +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY + +void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip, + struct irq_fwspec *fwspec, + unsigned int parent_hwirq, + unsigned int parent_type); +void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip, + struct irq_fwspec *fwspec, + unsigned int parent_hwirq, + unsigned int parent_type); + +#else + +static void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip, + struct irq_fwspec *fwspec, + unsigned int parent_hwirq, + unsigned int parent_type) +{ +} + +static void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip, + struct irq_fwspec *fwspec, + unsigned int parent_hwirq, + unsigned int parent_type) +{ +} + +#endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */ + + - #if IS_ENABLED(CONFIG_GPIO_GENERIC) - int bgpio_init(struct gpio_chip *gc, struct device *dev, unsigned long sz, void __iomem *dat, void __iomem *set, void __iomem *clr, void __iomem *dirout, void __iomem *dirin,
Attachment:
pgpgkNq8Vwqs6.pgp
Description: OpenPGP digital signature