From: Thierry Reding <thierry.reding@gmail.com>
To: Thierry Reding <thierry.reding@kernel.org>
Cc: Linus Walleij <linusw@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peter Chen <peter.chen@cixtech.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the pinctrl tree
Date: Wed, 6 May 2026 15:51:06 +0200 [thread overview]
Message-ID: <aftHEpJMopvbeFKu@orome> (raw)
In-Reply-To: <bdb98d48984f53087669d761f771f72e@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
On Wed, May 06, 2026 at 12:02:09PM +0200, Thierry Reding wrote:
> Hi all,
>
> Today's linux-next merge of the pinctrl tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> 2fd3902c91c8 ("pinctrl: qcom: Make important drivers default")
>
> from the pinctrl tree and commit:
>
> 517d8fc52f3c ("arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO")
>
> from the pinctrl tree.
Sorry, looks like I messed up the invocation here. The conflict is
between the pinctrl and the cix tree, obviously.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2026-05-06 13:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-06 10:02 linux-next: manual merge of the pinctrl tree with the pinctrl tree Thierry Reding
2026-05-06 13:51 ` Thierry Reding [this message]
2026-05-06 18:58 ` Linus Walleij
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=aftHEpJMopvbeFKu@orome \
--to=thierry.reding@gmail.com \
--cc=krzysztof.kozlowski@oss.qualcomm.com \
--cc=linusw@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.chen@cixtech.com \
--cc=thierry.reding@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