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] [day] [month] [year] [list]

Message-ID: <e70f4454-d0f5-4b3e-9751-730781f056f9@sirena.org.uk>
Date: Mon, 15 Sep 2025 23:13:06 +0100
From: Mark Brown <broonie@...nel.org>
To: Wolfram Sang <wsa+renesas@...g-engineering.com>
Cc: 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>,
	Thierry Reding <treding@...dia.com>
Subject: Re: linux-next: manual merge of the i2c tree with the arm-soc tree

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.

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