linux-kernel - linux-next: manual merge of the mtd tree with the origin 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-next>] [day] [month] [year] [list]

Message-ID: <aXJCtrMEK8vhp7wc@sirena.org.uk>
Date: Thu, 22 Jan 2026 15:31:02 +0000
From: Mark Brown <broonie@...nel.org>
To: Richard Weinberger <richard.weinberger@...il.com>
Cc: Linus Walleij <linusw@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Miquel Raynal <miquel.raynal@...tlin.com>,
	Rob Herring <robh@...nel.org>
Subject: linux-next: manual merge of the mtd tree with the origin tree

Hi all,

Today's linux-next merge of the mtd tree got a conflict in:

  Documentation/devicetree/bindings/mtd/partitions/seama.yaml

between commit:

  54de247a0efa4 ("dt-bindings: Updates Linus Walleij's mail address")

from the origin tree and commit:

  125981ffa1674 ("dt-bindings: mtd: partitions: Combine simple partition bindings")

from the mtd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

[Dropped the removed file]