Merge tag 'v5.17-rc8' into irq/core, to fix conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 14 Mar 2022 17:52:36 +0000 (18:52 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 14 Mar 2022 17:53:00 +0000 (18:53 +0100)
Conflicts:
drivers/pinctrl/pinctrl-starfive.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
MAINTAINERS
drivers/pinctrl/pinctrl-starfive.c

diff --cc MAINTAINERS
Simple merge
@@@ -1307,8 -1308,8 +1308,6 @@@ static int starfive_probe(struct platfo
        sfp->gc.base = -1;
        sfp->gc.ngpio = NR_GPIOS;
  
-       starfive_irq_chip.name = sfp->gc.label;
 -      starfive_irq_chip.parent_device = dev;
--
        sfp->gc.irq.chip = &starfive_irq_chip;
        sfp->gc.irq.parent_handler = starfive_gpio_irq_handler;
        sfp->gc.irq.num_parents = 1;