From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: Mark Brown <broonie@kernel.org>
Cc: Wolfram Sang <wsa@kernel.org>, Akhil R <akhilrajeev@nvidia.com>,
Kartik Rajput <kkartik@nvidia.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Thierry Reding <treding@nvidia.com>
Subject: Re: linux-next: manual merge of the i2c tree with the arm-soc tree
Date: Mon, 15 Sep 2025 23:04:56 +0200 [thread overview]
Message-ID: <aMh_eKWqkuLODo2r@shikoro> (raw)
In-Reply-To: <aMhR9TJm5V5EqaoC@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
> 's linux-next merge of the i2c tree got a conflict in:
>
> Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml
>
> between commit:
>
> 804ebc2bdcc85 ("dt-bindings: i2c: nvidia,tegra20-i2c: Document Tegra264 I2C")
>
> from the arm-soc tree and commit:
? Usually such patches go via I2C? And v6 was still under discussion? Do
i miss something?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2025-09-15 21:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 17:50 linux-next: manual merge of the i2c tree with the arm-soc tree Mark Brown
2025-09-15 21:04 ` Wolfram Sang [this message]
2025-09-15 22:13 ` Mark Brown
2025-09-16 21:46 ` Thierry Reding
2025-09-17 21:14 ` Wolfram Sang
2025-09-22 12:03 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2021-08-18 0:08 Stephen Rothwell
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=aMh_eKWqkuLODo2r@shikoro \
--to=wsa+renesas@sang-engineering.com \
--cc=akhilrajeev@nvidia.com \
--cc=broonie@kernel.org \
--cc=kkartik@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=treding@nvidia.com \
--cc=wsa@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