From: Arnd Bergmann Date: Fri, 5 Jan 2018 21:11:47 +0000 (+0100) Subject: Merge commit '8bb65fc06c' into next/soc X-Git-Tag: v4.19~1678^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71ebb396b7b0bd2f45034786fd4eb496cb1fccdd;p=platform%2Fkernel%2Flinux-rpi.git Merge commit '8bb65fc06c' into next/soc This includes one fix from mainline to avoid introducing a build regression after the pxa tree starts using gpio-reg: drivers/gpio/gpio-reg.c:106:21: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'? drivers/gpio/gpio-reg.c:107:29: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'? * commit '8bb65fc06c': gpio: gpio-reg: fix build Signed-off-by: Arnd Bergmann --- 71ebb396b7b0bd2f45034786fd4eb496cb1fccdd