On Fri, Jan 27, 2023, at 14:39, Linus Walleij wrote: > On Fri, Jan 27, 2023 at 11:12 AM Arnd Bergmann <arnd@xxxxxxxxxx> wrote: > >> From: Arnd Bergmann <arnd@xxxxxxxx> >> >> Almost all gpio drivers include linux/gpio/driver.h, and other >> files should not rely on includes from this header. >> >> Remove the indirect include from here and include the correct >> headers directly from where they are used. >> >> Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> >> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> > > As mentioned on v1 you will need two additional patches to > avoid build errors from the bots, perhaps Bartosz can cherry-pick > them? Yes, that would be ideal. > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git/commit/?h=gpiochip-no-driver-h&id=73ca8058a7b2075c993040bdc92b6a82f57d4316 > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git/commit/?h=gpiochip-no-driver-h&id=89f4f9cc70c686303679e57bdc3ac86507979fe3 > > (Maybe the Viper cf adapter is deleted in the PXA boardfile removal so > it's not an issue. The HTE file needs patching through.) > > Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx> Thanks! Indeed, the viper support is gone in linux-next, which is why that change was gone from my series after rebasing. I have the same HTE file change in my tree that you have, but misclassified it as an existing bug rather than one caused by my patch. The maintainer said they would apply my patch directly, but it has not shown up in linux-next yet. I agree that for both patches the best way is if Bartosz applies your version before my series. Arnd [1] https://lore.kernel.org/all/38f2d681-80a8-dc97-e5ed-4886e5e3bf7c@xxxxxxxxxx/