From: Linus Torvalds <torvalds@linux-foundation.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
"open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Bartosz Golaszewski <brgl@bgdev.pl>,
Arnd Bergmann <arnd@arndb.de>,
"D, Lakshmi Sowjanya" <lakshmi.sowjanya.d@intel.com>
Subject: Re: [GIT PULL] pin control changes for v5.17
Date: Wed, 12 Jan 2022 11:09:23 -0800 [thread overview]
Message-ID: <CAHk-=whcTsfaQWjNKP+DUSqfo+3rf1o8-N9CpjpogMhAxiJZ=Q@mail.gmail.com> (raw)
In-Reply-To: <CACRpkdaVGwu=Bo5bxVQYZXD-k+x++SuOTApGoK2a_S-1M4Q+nQ@mail.gmail.com>
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.
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.
Linus
next prev parent reply other threads:[~2022-01-12 19:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 11:23 [GIT PULL] pin control changes for v5.17 Linus Walleij
2022-01-12 19:09 ` Linus Torvalds [this message]
2022-01-12 20:38 ` Andy Shevchenko
2022-01-12 20:56 ` Andy Shevchenko
2022-01-12 21:02 ` Linus Torvalds
2022-01-12 19:12 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHk-=whcTsfaQWjNKP+DUSqfo+3rf1o8-N9CpjpogMhAxiJZ=Q@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=brgl@bgdev.pl \
--cc=lakshmi.sowjanya.d@intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).