Messages in this thread | | | Date | Wed, 12 Jan 2022 22:38:40 +0200 | From | Andy Shevchenko <> | Subject | Re: [GIT PULL] pin control changes for v5.17 |
| |
On Wed, Jan 12, 2022 at 11:09:23AM -0800, Linus Torvalds wrote: > On Wed, Jan 12, 2022 at 3:23 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > > > - There will be conflicts! Kconfig and Makefile conflicts due to > > some RISC-V Starfive patches getting merged through the > > SoC tree while we were tidying up the Kconfig and Makefile > > (to avoid merge conflicts, heh) there is a resolution in linux-next > > which was discussed and reviewed to be correct. > > Whoever sorted the Makefile entries (yeah, it was Andy) isn't very good at it.
Indeed. Sorry for that, I will send an update for next cycle.
> The broken sorting put CONFIG_PINCTRL_STMFX before CONFIG_PINCTRL_ST, > and I have no idea how you can sort that way. > > I left the broken sorting in place, because changing the sort order in > the merge would just be even *more* confusing. > > There may be other cases of that kind of oddity, I just happened to > notice that one because the 'starfive' thing ended up having that same > 'st' beginning, and I went D'Oh when trying to make sure my merge kept > the ordering. > > The sort order is fine in the Kconfig file. Maybe some odd sorting got > confused by the next non-letter character (either ')' after the config > name, or '.o' of the object file name). > > Obviously not a big deal, but it's an oddity.
-- With Best Regards, Andy Shevchenko
| |