On Thu, Sep 12, 2024, at 07:48, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  arch/arm/mach-ep93xx/vision_ep9307.c

between commit:

  3e0bae7f35c9 ("ARM: ep93xx: delete all boardfiles")

from the arm-soc tree and commits:

  4b2b0a2ce815 ("gpiolib: legacy: Kill GPIOF_INIT_* definitions")
  8c045ca534d0 ("gpiolib: legacy: Kill GPIOF_DIR_* definitions")

from the gpio-brgl tree.

I fixed it up (I removed the file)

Looks good, thanks,

     Arnd