| | |
|---|---|
| base of every series | `0c48d26d46bd` ("btrfs: stop reading free space inodes from the commit root"), the misc-next lane base (`misc-next/testing^1`) |
-| integration branch | `misc-next/testing` `94e2d2a928c6` (octopus of all 20 topics) |
-| lane head | `zygo-misc-next-zb64` `d80f06194759`; its own commits on top of `testing` (kernel configs, `covers/`) are not exported |
+| integration branch | `misc-next/testing` `3b6557663e94` (octopus of all 20 topics) |
+| lane head | `zygo-misc-next-zb64` `03fd98a3ff17`; its own commits on top of `testing` (kernel configs, `covers/`) are not exported |
The base is not a published commit: the lane rebuilds it from
btrfs/for-next plus David Sterba's queue. It lives in the
| `replace-fixes` | 7 | `43c8a1e60a5a` | Zygo | new | patch 7 has a btrfs-progs counterpart (`topics/replace-abort-uncorrectable`) |
| `dev-stats` | 1 | `55ade1cf195c` | Zygo | new, 0/1 (2026-10-21) | behaviour change, offered for rejection; independent of every other series |
| `resize-missing` | 1 | `8763f9e2126d` | Qu Wenruo, rewritten by Zygo | new, 0/1 (2026-10-21) | Qu's 2019 patch reworked: grow checks now return, absolute sizes checked; Zygo's Signed-off-by to be added before sending |
-| `read-repair-fixes` | 4 | `9736ec071097` | Zygo | new 2026-10-22; 0/4 | read repair and scrub after an abort: NULL end_io (v6.3+), same csum root, no repair writes after abort; Cc stable on all 4; raid56 left as upstream |
+| `read-repair-fixes` | 4 | `035bd2f8c1e3` | Zygo | new 2026-10-22; 0/4 | read repair and scrub after an abort: NULL end_io (v6.3+), same csum root, no repair writes after abort; Cc stable on 1-2 only (the abort-write rule is under revision upstream); raid56 left as upstream |
## Applying one series
- `balance-resume` patch 3 is offered for rejection, as its cover letter
says.
- Re-export with `scripts/export.sh` after any lane change. The
- directories reflect the lane at `misc-next/testing` `94e2d2a928c6`.
+ directories reflect the lane at `misc-next/testing` `3b6557663e94`.
Commit the result with the misc-next SHAs that the script prints.
-From 9736ec0710971ca14f5204fe604a209766fb9466 Mon Sep 17 00:00:00 2001
+From 035bd2f8c1e3e4a22eeb388f4a35a558af9ea424 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
-Date: Thu, 22 Oct 2026 21:41:32 -0400
+Date: Thu, 22 Oct 2026 21:56:55 -0400
Subject: [PATCH 0/4] btrfs: read repair and scrub after a transaction abort
To: linux-btrfs@vger.kernel.org
raid56 parity scrub, the raid56 RMW write-back and the dev-replace target
copy are unchanged.
+The rule for writes after an abort is being revised upstream, so patches
+3 and 4 carry no stable tag; patches 1 and 2 do.
+
Tested on misc-next and 6.18, KASAN kernels. A write detector counts
every write, discard and flush to the member devices from the abort to
after unmount; a known write inside that window is counted in every
-From 96c712193047ea097b1270e9fdea7685966a49d4 Mon Sep 17 00:00:00 2001
+From 0f853995814e3ab2c39bc79e6ba8a97b2c0caae1 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Thu, 22 Oct 2026 14:31:48 -0400
Subject: [PATCH 3/4] btrfs: do not write back a read repair after a
Fixes: 8ceaad6cd6e7 ("btrfs: do not ASSERT() when the fs flips RO inside btrfs_repair_io_failure()")
Fixes: 9b2839451dfc ("btrfs: introduce a new shutdown state")
-Cc: stable@vger.kernel.org # 6.18+
Assisted-by: Claude:claude-opus-5-5
---
fs/btrfs/bio.c | 2 +-
-From 9736ec0710971ca14f5204fe604a209766fb9466 Mon Sep 17 00:00:00 2001
+From 035bd2f8c1e3e4a22eeb388f4a35a558af9ea424 Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Thu, 22 Oct 2026 14:31:49 -0400
Subject: [PATCH 4/4] btrfs: scrub: do not write back repairs after a
device after the abort and the bad copy stays as it was.
Fixes: 54765392a1b9 ("btrfs: scrub: introduce helper to queue a stripe for scrub")
-Cc: stable@vger.kernel.org # 6.6+
Assisted-by: Claude:claude-opus-5-5
---
fs/btrfs/scrub.c | 6 +++++-
intact, detected, and repaired by scrub. It covers the normal repair path
the patch touches (repair bios that submit cleanly), not the failure path.
-## Follow-up patches 2-5 (s-repair; promoted 2026-10-22: misc-next topic c2a23411b4c7, zb64 aee0ffb1fba5; 6.18 topic a9fe36da2539, zb64 8fcf012e67b0. Zygo 10-22: the abort rule is under revision upstream, so raid56 stays as upstream; P4b (parity scrub) and the raid56-fixes RMW guard were dropped: misc-next topic 9736ec071097, zb64 d80f06194759; 6.18 topic 949e59762373, zb64 ceca39cf50b0. Rows naming P4b or R56 describe kernels that had them.)
+## Follow-up patches 2-5 (s-repair; promoted 2026-10-22: misc-next topic c2a23411b4c7, zb64 aee0ffb1fba5; 6.18 topic a9fe36da2539, zb64 8fcf012e67b0. Zygo 10-22: the abort rule is under revision upstream, so raid56 stays as upstream; P4b (parity scrub) and the raid56-fixes RMW guard were dropped: misc-next topic 9736ec071097, zb64 d80f06194759; 6.18 topic 949e59762373, zb64 ceca39cf50b0. Rows naming P4b or R56 describe kernels that had them. P3/P4a then lost their Cc stable (message-only): misc-next topic 035bd2f8c1e3, zb64 03fd98a3ff17; 6.18 topic 212f16eb1e10, zb64 db1814ba6c9a.)
Zygo's rule (2026-10-22): no writes after an abort, repair writes
included; a read may use the commit root to repair in memory but must not