On Tue, Jan 20, 2026 at 8:56 AM Miquel Raynal [off-list ref] wrote:
Hello,
quoted
quoted
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?
That's the only modification and it is in 6.19-rc2.
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.
That's not really necessary for trivial merge resolutions like this one.
Rob