linux-kernel - Re: linux-next: manual merge of the i2c tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ofp27qiwsw7jj5ne3y7kp2lpycwg37bvhswidwe6jfazs2czzp@76gzsofmliyc>
Date: Tue, 16 Sep 2025 23:46:30 +0200
From: Thierry Reding <treding@...dia.com>
To: Mark Brown <broonie@...nel.org>
Cc: Wolfram Sang <wsa+renesas@...g-engineering.com>, 
	Wolfram Sang <wsa@...nel.org>, Akhil R <akhilrajeev@...dia.com>, 
	Kartik Rajput <kkartik@...dia.com>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the i2c tree with the arm-soc tree

On Mon, Sep 15, 2025 at 11:13:06PM +0100, Mark Brown wrote:
> On Mon, Sep 15, 2025 at 11:04:56PM +0200, Wolfram Sang wrote:
> 
> > > '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?
> 
> IIRC it came into arm-soc from Tegra but ICBW there.

In the past I've usually picked up DT bindings patches into the Tegra
tree because they are needed in order to validate the corresponding DT
changes.

Note also that I only applied the DT bindings patch from the v6 series
because it was already acked by device tree maintainers and there have
not been any objections to the DT bits, nor are they relevant to the
driver changes still being reviewed.

In the meantime, we have follow-on patches for Tegra264 that are being
blocked by the lack of I2C DT nodes. In order to unblock those I want to
get the DT bindings patch merged along with the DT changes for v6.18 so
that we can make progress on these other patches.

We'll continue revising the driver series and address all the feedback
that's been provided.

Thanks,
Thierry

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)