From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 14 Mar 2022 17:52:36 +0000 (+0100)
Subject: Merge tag 'v5.17-rc8' into irq/core, to fix conflicts
X-Git-Tag: v6.6.17~8004^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=411472ae5bb4ffe1404dc5f1505f07e0f04770a8;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v5.17-rc8' into irq/core, to fix conflicts

Conflicts:
	drivers/pinctrl/pinctrl-starfive.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

411472ae5bb4ffe1404dc5f1505f07e0f04770a8
diff --cc drivers/pinctrl/pinctrl-starfive.c
index 5be9866,266da41..ab4b2ee
--- a/drivers/pinctrl/pinctrl-starfive.c
+++ b/drivers/pinctrl/pinctrl-starfive.c
@@@ -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;