On Wed, Sep 29, 2021 at 7:14 PM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote: > > I dropped those two offending commits from my tree for now > (with a different reason). > > I will try my best to avoid complex conflicts next time. Thanks Masahiro -- let me know if you need anything from my side or if you prefer another solution etc. Cheers, Miguel