Re: linux-next: manual merge of the xilinx tree with the ti tree

[Mark Brown]

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.

Attachment: signature.asc
Description: PGP signature