linux-kernel - Re: linux-next: manual merge of the xilinx tree with the ti 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: <c9d3063a-a652-4db9-8e62-3be34ccb27ef@sirena.org.uk>
Date: Mon, 19 Jan 2026 15:21:44 +0000
From: Mark Brown <broonie@...nel.org>
To: Michal Simek <michal.simek@....com>
Cc: Michal Simek <monstr@...str.eu>, Arnd Bergmann <arnd@...db.de>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Michael Walle <mwalle@...nel.org>, Nishanth Menon <nm@...com>
Subject: Re: linux-next: manual merge of the xilinx tree with the ti tree

On Mon, Jan 19, 2026 at 04:17:46PM +0100, Michal Simek wrote:

> I have sent merge request to Arnd today. My 2 patches are in Linux-next for
> a while that's why it is new change coming from that second tree.

The merge order is fixed so it's just a question of which tree was
already merged which shows as the conflicting tree.

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