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: <309cb42f-8a0a-4daf-865d-d36df4b1da16@kernel.org>
Date: Tue, 20 Jan 2026 16:13:56 +0100
From: Krzysztof Kozlowski <krzk@...nel.org>
To: Miquel Raynal <miquel.raynal@...tlin.com>, Rob Herring <robh@...nel.org>
Cc: Richard Weinberger <richard@....at>, Vignesh Raghavendra
 <vigneshr@...com>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
 Conor Dooley <conor+dt@...nel.org>,
 Brian Norris <computersforpeace@...il.com>, Kamal Dasu
 <kdasu.kdev@...il.com>, William Zhang <william.zhang@...adcom.com>,
 Nick Terrell <terrelln@...com>, David Sterba <dsterba@...e.com>,
 Rafał Miłecki <rafal@...ecki.pl>,
 Simon Glass <sjg@...omium.org>, Linus Walleij <linusw@...nel.org>,
 Ulf Hansson <ulf.hansson@...aro.org>,
 Marcus Folkesson <marcus.folkesson@...il.com>,
 Tony Lindgren <tony@...mide.com>, Roger Quadros <rogerq@...nel.org>,
 Hauke Mehrtens <hauke@...ke-m.de>, linux-mtd@...ts.infradead.org,
 devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
 linux-mmc@...r.kernel.org
Subject: Re: [PATCH 00/10] dt-bindings: mtd: Partition binding fixes and
 restructuring

On 20/01/2026 15:56, Miquel Raynal wrote:
> Hello,
> 
>>> The series does not apply cleanly, I tried mtd/next and then
>>> v6.19-rc1. Can you please rebase it and fix the conflicts (at least 2
>>> patches fail, and then I stopped)?
>>
>> I rebased on mtd/next and sent v2. I only saw one conflict though, and
>> that was with seama.yaml. That's going to conflict with Linus' tree,
>> but the resolution is take the deleted file.
> 
> I didn't see where this seama file was modified, except for Linus W.'s
> address change. Is there an -rc I need to pull? Or an immutable tag?
> 
> Maybe this series applies on top of your next branch? I can give an ack
> for the full series if that's the case and you can take it.
> 
> I generally try my best to avoid conflicts at merge.

For the record, v2 applied cleanly on mtd/next.

Best regards,
Krzysztof

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ