From ad7c6fc00a9f2cfc49fa243213641135fee6118e Mon Sep 17 00:00:00 2001
From: Alexander Miroshnichenko <alex@millerson.name>
Date: Fri, 20 Dec 2024 17:26:34 +0300
Subject: [PATCH] sys-kernel/hardened-kernel: bump v6.12.6

bcachefs patches synced to ca2e7a3de895c703d2cbbd9b63c10d8adfba8228 from master branch

Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
---
 sys-kernel/hardened-kernel/Manifest           |   8 +-
 ...try_estale-in-bch2_ioctl_subvolume_c.patch |   2 +-
 ...002-bcachefs-Fix-racy-use-of-jiffies.patch |   2 +-
 ...-remove-superfluous-after-statements.patch |   2 +-
 ...ode_should_have_bp-bch2_inode_should.patch |   2 +-
 ...backpointer-now-uses-dirent_get_by_p.patch |   2 +-
 ...key_has_snapshot_overwrites-uses-for.patch |   2 +-
 ...ding-don-t-invoke-__call_rcu-under-l.patch |   2 +-
 ...008-bcachefs-bch_verbose_ratelimited.patch |   2 +-
 ...sk-accounting-hooks-out-of-trans_com.patch |   2 +-
 .../0010-bcachefs-Delete-dead-code.patch      |   2 +-
 ...-move-bch2_xattr_handlers-to-.rodata.patch |   2 +-
 ...cachefs-Remove-unnecessary-peek_slot.patch |   2 +-
 ...fs-kill-btree_trans_restart_nounlock.patch |   2 +-
 ...-bcachefs-fixed-some-spelling-mistak.patch |   2 +-
 ...fs-Remove-duplicate-included-headers.patch |   2 +-
 ...EACH_ACL_ENTRY-macro-to-iterate-over.patch |   2 +-
 ...hefs-add-more-path-idx-debug-asserts.patch |   2 +-
 ...n_explicit_recovery_pass-returns-dif.patch |   2 +-
 ...hefs-lru-accounting-are-alloc-btrees.patch |   2 +-
 ...ocking-for-bch_fs.curr_recovery_pass.patch |   2 +-
 ...ree_lost_data-now-uses-run_explicit_.patch |   2 +-
 ...0022-bcachefs-improved-bkey_val_copy.patch |   2 +-
 ...-Factor-out-jset_entry_log_msg_bytes.patch |   2 +-
 ...error-message-in-check_snapshot_tree.patch |   2 +-
 ...025-bcachefs-Avoid-bch2_btree_id_str.patch |   2 +-
 ...r-new-stripe-path-to-reduce-dependen.patch |   2 +-
 ...overy-now-bails-out-of-recovery-earl.patch |   2 +-
 ...2_journal_meta-takes-ref-on-c-writes.patch |   2 +-
 ...ning-about-passing-flex-array-member.patch |   2 +-
 ...efs-Add-block-plugging-to-read-paths.patch |   2 +-
 ...sion-check-for-bch_btree_ptr_v2.sect.patch |   2 +-
 ...s-Use-str_write_read-helper-function.patch |   2 +-
 ..._write_read-helper-in-ec_block_endio.patch |   2 +-
 ..._write_read-helper-in-write_super_en.patch |   2 +-
 ...e-struct-bucket_gens-with-__counted_.patch |   2 +-
 .../0036-bcachefs-avoid-unsigned-flags.patch  |   2 +-
 ...2_data_update_opts_to_text-in-trace_.patch |   2 +-
 .../0038-bcachefs-bch2_io_opts_fixups.patch   |   2 +-
 ...mall-cleanup-for-extent-ptr-bitmasks.patch |   2 +-
 ...chefs-kill-bch2_bkey_needs_rebalance.patch |   2 +-
 ...l-__bch2_bkey_sectors_need_rebalance.patch |   2 +-
 ...bch_extent_rebalance-fields-to-match.patch |   2 +-
 ...3-bcachefs-io_opts_to_rebalance_opts.patch |   2 +-
 ..._io_opts-fields-for-indicating-wheth.patch |   2 +-
 ...enabled-rebalance_enabled-now-opts.h.patch |   2 +-
 .../0046-bcachefs-bch2_prt_csum_opt.patch     |   2 +-
 ...hefs-New-bch_extent_rebalance-fields.patch |   2 +-
 ...ite_inode-now-checks-for-changing-re.patch |   2 +-
 ...9-bcachefs-get_update_rebalance_opts.patch |   2 +-
 ...s-Simplify-option-logic-in-rebalance.patch |   2 +-
 ...chefs-Improve-trace_rebalance_extent.patch |   2 +-
 ...h_extent_rebalance-code-to-rebalance.patch |   2 +-
 ...write-permission-for-gc_gens_pos-sys.patch |   2 +-
 ...ribute-define-helper-for-sysfs-attri.patch |   2 +-
 ...ert-for-use-of-journal-replay-keys-f.patch |   2 +-
 ...achefs-Kill-BCH_TRANS_COMMIT_lazy_rw.patch |   2 +-
 ...chefs-Improved-check_topology-assert.patch |   2 +-
 ...andled-transaction-restart-in-evacua.patch |   2 +-
 ...we-re-not-in-a-restart-in-bch2_trans.patch |   2 +-
 ...060-bcachefs-Better-in_restart-error.patch |   2 +-
 ...ans_verify_not_unlocked_or_in_restar.patch |   2 +-
 ...that-we-re-not-violating-key-cache-c.patch |   2 +-
 ...btree_iter_peek_upto-btree_iter_peek.patch |   2 +-
 ...ify-btree_iter_peek-filter_snapshots.patch |   2 +-
 ...necessary-iter_rewind-in-bkey_get_em.patch |   2 +-
 ...chefs-Move-fsck-ioctl-code-to-fsck.c.patch |   2 +-
 ...port-for-true-false-yes-no-in-bool-t.patch |   2 +-
 ...-the-description-of-the-bucket-size-.patch |   2 +-
 ...efs-Add-support-for-FS_IOC_GETFSUUID.patch |   2 +-
 ...dd-support-for-FS_IOC_GETFSSYSFSPATH.patch |   2 +-
 ...-NULL-pointer-checks-for-__filemap_g.patch |   2 +-
 ...redundant-initialization-in-bch2_vfs.patch |   2 +-
 ...hefs-Simplify-code-in-bch2_dev_alloc.patch |   2 +-
 ...se-page-allocator-for-sb_read_scratc.patch |   2 +-
 .../0075-bcachefs-Fix-shutdown-message.patch  |   2 +-
 .../0076-bcachefs-delete-dead-code.patch      |   2 +-
 ...077-bcachefs-bch2_btree_bit_mod_iter.patch |   2 +-
 ...dead-code-from-bch2_discard_one_buck.patch |   2 +-
 ...ors-are-expected-when-reconstructing.patch |   2 +-
 .../0080-bcachefs-Kill-FSCK_NEED_FSCK.patch   |   2 +-
 ...hefs-Reserve-8-bits-in-bch_reflink_p.patch |   2 +-
 ...-bcachefs-Reorganize-reflink.c-a-bit.patch |   2 +-
 ...elete-reflink-pointers-to-missing-in.patch |   2 +-
 ...consistent-err-in-invalidate_one_buc.patch |   2 +-
 ...bch2_bucket_alloc_freelist-freelist-.patch |   2 +-
 ...oc_bucket-now-uses-bch2_check_discar.patch |   2 +-
 ...cket_do_index-inconsistent_err-fsck_.patch |   2 +-
 ..._one_bucket-now-uses-need_discard_or.patch |   2 +-
 ...s-Implement-bch2_btree_iter_prev_min.patch |   2 +-
 ...ev_min-Search-forwards-for-extents-s.patch |   2 +-
 ...backpointers-check-in-try_alloc_buck.patch |   2 +-
 ...chefs-Kill-bch2_get_next_backpointer.patch |   2 +-
 ...achefs-add-missing-BTREE_ITER_intent.patch |   2 +-
 ...sion-workspaces-should-be-indexed-by.patch |   2 +-
 ...se-a-shared-decompress-workspace-mem.patch |   2 +-
 ...UG_ON-when-superblock-feature-wasn-t.patch |   2 +-
 ...chefs-kill-bch2_journal_entries_free.patch |   2 +-
 ...-keys-sort-keys-for-interior-nodes-f.patch |   2 +-
 ...nd_journal_iter-don-t-iterate-over-t.patch |   2 +-
 ...-2-issue-with-whiteouts-in-journal-k.patch |   2 +-
 ...chefs-Fix-evacuate_bucket-tracepoint.patch |   2 +-
 ...s-fix-bp_pos_to_bucket_nodev_noerror.patch |   2 +-
 ...k-for-backpointers-to-invalid-device.patch |   2 +-
 .../0104-bcachefs-bucket_pos_to_bp_end.patch  |   2 +-
 ...ab-code-for-backpointers-in-alloc-ke.patch |   2 +-
 ...s-bch_backpointer-bkey_i_backpointer.patch |   2 +-
 ...ck_backpointers_to_extents-range-lim.patch |   2 +-
 ...-bch_backpointer.bucket_offset-usage.patch |   2 +-
 ...09-bcachefs-New-backpointers-helpers.patch |   2 +-
 ...-block-journal-activity-without-clos.patch |   2 +-
 ...ivial-btree-write-buffer-refactoring.patch |   2 +-
 ...reads-more-in-favor-of-faster-device.patch |   2 +-
 ...-fastpath-now-uses-bch2_discard_one_.patch |   2 +-
 ...rite_buffer_flush_seq-no-longer-clos.patch |   2 +-
 ...BCH_ERR_btree_node_read_error_cached.patch |   2 +-
 ...arate-rhltable-for-bch2_inode_or_des.patch |   2 +-
 ...chefs-errcode-cleanup-journal-errors.patch |   2 +-
 ...counting-bch2_dev_rcu-bch2_dev_rcu_n.patch |   2 +-
 ...s-Fix-accounting_read-when-we-rewind.patch |   2 +-
 ...ointer_to_missing_ptr-is-now-autofix.patch |   2 +-
 ...ee-node-scan-when-unknown-btree-IDs-.patch |   2 +-
 ...achefs-Kill-bch2_bucket_alloc_new_fs.patch |   2 +-
 ...hefs-Bad-btree-roots-are-now-autofix.patch |   2 +-
 ...-misordered-check-in-btree-node-read.patch |   2 +-
 ...ry-to-en-decrypt-when-encryption-not.patch |   2 +-
 ...disk-accounting-version-0-check-to-c.patch |   2 +-
 ...Fix-bch2_btree_node_update_key_early.patch |   2 +-
 ...fs-Go-RW-earlier-for-normal-rw-mount.patch |   2 +-
 ...ll-ptr-deref-in-btree_path_lock_root.patch |   2 +-
 ...ore-empty-btree-root-journal-entries.patch |   2 +-
 ...cachefs-struct-bkey_validate_context.patch |   2 +-
 ...cachefs-Make-topology-errors-autofix.patch |   2 +-
 ...133-bcachefs-BCH_FS_recovery_running.patch |   2 +-
 ...s-Guard-against-journal-seq-overflow.patch |   2 +-
 ...-transaction-restart-after-commit-in.patch |   2 +-
 ...gainst-backpointers-to-unknown-btree.patch |   2 +-
 ...efs-Fix-journal_iter-list-corruption.patch |   2 +-
 ...-bcachefs-add-missing-printbuf_reset.patch |   2 +-
 ...39-bcachefs-mark-more-errors-AUTOFIX.patch |   2 +-
 ...-t-error-out-when-logging-fsck-error.patch |   2 +-
 .../0141-bcachefs-do_fsck_ask_yn.patch        |   2 +-
 ...for-bucket-journal-seq-in-the-future.patch |   2 +-
 ...-for-inode-journal-seq-in-the-future.patch |   2 +-
 ...raphic-MACs-on-superblock-are-not-ye.patch |   2 +-
 ..._trans_relock-is-trylock-for-lockdep.patch |   2 +-
 ...or-extent-crc-uncompressed-compresse.patch |   2 +-
 ...ecurse-in-check_discard_freespace_ke.patch |   2 +-
 ...sing-parameter-description-to-bch2_b.patch |   2 +-
 ...achefs-Fix-fsck.c-build-in-userspace.patch |   2 +-
 .../0150-bcachefs-bch2_inum_to_path.patch     |   2 +-
 ...rt-write-path-errors-to-inum_to_path.patch |  23 +-
 .../0152-bcachefs-list_pop_entry.patch        |   6 +-
 ..._fsck_err-now-respects-errors_silent.patch |   4 +-
 ...id-repair-on-a-btree-node-make-sure-.patch |   4 +-
 ...bch2_async_btree_node_rewrites_flush.patch |   4 +-
 ...fix-bch2_journal_key_insert_take-seq.patch |   4 +-
 ...-unable-to-allocate-journal-write-me.patch |   4 +-
 ...Fix-allocating-too-big-journal-entry.patch |   4 +-
 ...S_PATH_TRACEPOINTS-should-depend-on-.patch |   4 +-
 ...s-rcu_pending-now-works-in-userspace.patch |   4 +-
 ...ops-only-use-inum-0-of-logged-ops-bt.patch |   4 +-
 ...mplify-disk-accounting-validate-late.patch |   4 +-
 ...-to-next-bp-on-BCH_ERR_backpointer_t.patch |   4 +-
 ...bcachefs-trace_accounting_mem_insert.patch |   4 +-
 ...-unable-to-allocate-journal-write-if.patch |   4 +-
 ...BCH_ERR_insufficient_journal_devices.patch |   4 +-
 ...lure-to-allocate-journal-write-on-di.patch |   4 +-
 ..._alloc_list.devs-dev_alloc_list.data.patch |   4 +-
 ...-write-path-refactoring-debug-improv.patch |   4 +-
 ...h2_btree_lost_data-on-btree-read-err.patch |   4 +-
 ...re-__bch2_run_explicit_recovery_pass.patch |   4 +-
 ...all-bch2_btree_interior_update_will_.patch |   4 +-
 ...ll-flags-param-to-bch2_subvolume_get.patch |   4 +-
 .../0174-bcachefs-factor-out-str_hash.c.patch |   4 +-
 ...-space-calculations-should-skip-dura.patch |   4 +-
 ...2_btree_node_header_to_text-format-s.patch |   4 +-
 ...77-bcachefs-Mark-more-errors-autofix.patch |   4 +-
 ...hefs-Minor-bucket-alloc-optimization.patch |   4 +-
 .../0179-lib-min_heap-Switch-to-size_t.patch  |   4 +-
 ...eap-for-handling-overwrites-in-btree.patch |   4 +-
 ...key_validate_context-to-journal_entr.patch |   4 +-
 ...dd-unknown-accounting-types-to-eytzi.patch |   4 +-
 ...ket-needs-discard-inc-gen-on-empty-n.patch |   4 +-
 ...urnal_noflush_seq-now-takes-start-en.patch |   4 +-
 ...se-of-bucket-before-journal-flush-on.patch |   4 +-
 ...tart-rewriting-btree-nodes-until-aft.patch |   4 +-
 ...efs-Kill-unnecessary-mark_lock-usage.patch |   4 +-
 ...chefs-kill-sysfs-internal-accounting.patch |   4 +-
 ...per-errcodes-for-inode-unpack-errors.patch |   4 +-
 ...hefs-Don-t-BUG_ON-inode-unpack-error.patch |   4 +-
 ...r_hash_check_key-now-checks-inode-ha.patch |   4 +-
 ...eck_key_has_snapshot-prints-btree-id.patch |   4 +-
 .../0193-bcachefs-bch2_snapshot_exists.patch  |   4 +-
 ...chefs-trace_write_buffer_maybe_flush.patch |   4 +-
 ...ty-statement-between-label-and-decla.patch |   4 +-
 ...fs-Refactor-c-opts.reconstruct_alloc.patch |   4 +-
 ...heck_indirect_extents-can-run-online.patch |   4 +-
 ...chefs-tidy-up-__bch2_btree_iter_peek.patch |  66 +++
 ...achefs-tidy-btree_trans_peek_journal.patch |  94 ++++
 ...ee_trans_peek_key_cache-BTREE_ITER_a.patch |  37 ++
 ...x-key-cache-BTREE_ITER_all_snapshots.patch |  60 +++
 ...ata_type_set-happens-in-alloc-trigge.patch |  81 ++++
 ...run-overwrite-triggers-before-insert.patch | 148 ++++++
 ...uiv_seen-arg-to-delete_dead_snapshot.patch | 123 +++++
 ...t-deletion-no-longer-uses-snapshot_t.patch | 428 ++++++++++++++++++
 .../0206-bcachefs-Kill-snapshot_t-equiv.patch | 204 +++++++++
 .../0207-bcachefs-bch2_trans_log_msg.patch    |  65 +++
 ...sage-in-journal-for-snapshot-deletio.patch |  44 ++
 .../0209-bcachefs-trace_key_cache_fill.patch  |  90 ++++
 ...ree_path_peek_slot-doesn-t-return-er.patch |  44 ++
 ..._metadata_version_backpointer_bucke.patch} |   4 +-
 ..._metadata_version_disk_accounting_b.patch} |   4 +-
 ...ent_ptr_to_bp-no-longer-depends-on-.patch} |  10 +-
 ...achefs-kill-__bch2_extent_ptr_to_bp.patch} |   8 +-
 ...e-buffer-flush-param-to-backpointer.patch} |   4 +-
 ...tents_to_backpointers-now-only-chec.patch} |   4 +-
 ...kpointer_get_key-now-repairs-dangli.patch} |   4 +-
 ...ackpointer_target_not_found-error-m.patch} |   4 +-
 ...-check_backpointers_to_extents-in-d.patch} |   4 +-
 ...20-bcachefs-BCH_SB_VERSION_INCOMPAT.patch} |   4 +-
 ..._metadata_version_reflink_p_may_upd.patch} |   4 +-
 ...hanges-now-get-propagated-to-reflin.patch} |   4 +-
 ...achefs_metadata_version_inode_depth.patch} |   4 +-
 ..._metadata_version_persistent_inode_.patch} | 116 +++--
 ...efs_metadata_version_autofix_errors.patch} |   4 +-
 ...hefs-add-counter_flags-for-counters.patch} |   4 +-
 ...better-check_bp_exists-error-message.patch |  36 ++
 .../0228-bcachefs-Drop-racy-warning.patch     |  39 ++
 ...dundant-read-error-call-from-btree_g.patch |  43 ++
 ...cachefs-kill-__bch2_btree_iter_flags.patch | 101 +++++
 ...e-lock-btree-node-in-key-cache-fills.patch | 118 +++++
 ...dle-BCH_ERR_need_mark_replicas-in-gc.patch |  57 +++
 ...-bcachefs-Fix-assert-for-online-fsck.patch |  32 ++
 ...5.ebuild => hardened-kernel-6.12.6.ebuild} |   0
 235 files changed, 2283 insertions(+), 330 deletions(-)
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0198-bcachefs-tidy-up-__bch2_btree_iter_peek.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0199-bcachefs-tidy-btree_trans_peek_journal.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0200-bcachefs-Fix-btree_trans_peek_key_cache-BTREE_ITER_a.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0201-bcachefs-Fix-key-cache-BTREE_ITER_all_snapshots.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0202-bcachefs-alloc_data_type_set-happens-in-alloc-trigge.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0203-bcachefs-Don-t-run-overwrite-triggers-before-insert.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0204-bcachefs-Kill-equiv_seen-arg-to-delete_dead_snapshot.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0205-bcachefs-Snapshot-deletion-no-longer-uses-snapshot_t.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0206-bcachefs-Kill-snapshot_t-equiv.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0207-bcachefs-bch2_trans_log_msg.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0208-bcachefs-Log-message-in-journal-for-snapshot-deletio.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0209-bcachefs-trace_key_cache_fill.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0210-bcachefs-bch2_btree_path_peek_slot-doesn-t-return-er.patch
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0198-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch => 0211-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch} (98%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0199-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch => 0212-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch} (98%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0200-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch => 0213-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch} (94%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0201-bcachefs-kill-__bch2_extent_ptr_to_bp.patch => 0214-bcachefs-kill-__bch2_extent_ptr_to_bp.patch} (92%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0202-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch => 0215-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch} (98%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0203-bcachefs-check_extents_to_backpointers-now-only-chec.patch => 0216-bcachefs-check_extents_to_backpointers-now-only-chec.patch} (99%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0204-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch => 0217-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch} (98%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0205-bcachefs-better-backpointer_target_not_found-error-m.patch => 0218-bcachefs-better-backpointer_target_not_found-error-m.patch} (92%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0206-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch => 0219-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch} (98%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0207-bcachefs-BCH_SB_VERSION_INCOMPAT.patch => 0220-bcachefs-BCH_SB_VERSION_INCOMPAT.patch} (99%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0208-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch => 0221-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch} (98%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0209-bcachefs-Option-changes-now-get-propagated-to-reflin.patch => 0222-bcachefs-Option-changes-now-get-propagated-to-reflin.patch} (97%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0210-bcachefs-bcachefs_metadata_version_inode_depth.patch => 0223-bcachefs-bcachefs_metadata_version_inode_depth.patch} (98%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0211-bcachefs-bcachefs_metadata_version_persistent_inode_.patch => 0224-bcachefs-bcachefs_metadata_version_persistent_inode_.patch} (85%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0212-bcachefs-bcachefs_metadata_version_autofix_errors.patch => 0225-bcachefs-bcachefs_metadata_version_autofix_errors.patch} (93%)
 rename sys-kernel/hardened-kernel/files/linux-6.12/{0213-bcachefs-add-counter_flags-for-counters.patch => 0226-bcachefs-add-counter_flags-for-counters.patch} (98%)
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0227-bcachefs-better-check_bp_exists-error-message.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0228-bcachefs-Drop-racy-warning.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0229-bcachefs-Drop-redundant-read-error-call-from-btree_g.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0230-bcachefs-kill-__bch2_btree_iter_flags.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0231-bcachefs-Write-lock-btree-node-in-key-cache-fills.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0232-bcachefs-Handle-BCH_ERR_need_mark_replicas-in-gc.patch
 create mode 100644 sys-kernel/hardened-kernel/files/linux-6.12/0233-bcachefs-Fix-assert-for-online-fsck.patch
 rename sys-kernel/hardened-kernel/{hardened-kernel-6.12.5.ebuild => hardened-kernel-6.12.6.ebuild} (100%)

diff --git a/sys-kernel/hardened-kernel/Manifest b/sys-kernel/hardened-kernel/Manifest
index 8c75200..554babf 100644
--- a/sys-kernel/hardened-kernel/Manifest
+++ b/sys-kernel/hardened-kernel/Manifest
@@ -1,9 +1,9 @@
 DIST genpatches-6.11-10.base.tar.xz 757872 BLAKE2B 72566af9a781288f516dcd30881851fe371a0f3d072aeabbd9d3e57ea96896cb9d8f0d594f8729215baa83d9546c675789b596dac5781b3640e963059d23223b SHA512 ae04d309e3b97cfd7f09993cf297fa5825c53e83acc54805f1f6f2d09cd07aa1715866be3d59874d0131d1746a398b9449fda1987ea6bdbd66402e411569d874
 DIST genpatches-6.11-10.experimental.tar.xz 77928 BLAKE2B a0928f0ff7eb6b9a5659d0ab41dafcf3b474cd7aa357b65a7a147972132c08703a88467e51b7dbd8004781cb0cb8a9620190737963f1fcc1e9e5d98f68ba72d6 SHA512 2be91396f9ec97b2e051db72742e3db1edaa56255c7a2cde2ce2ecc1de4771e92ba6d55e863380fe4dc6ef8d8778bec1a9926a9ffe2dd5d1036b9c36a9afae13
 DIST genpatches-6.11-10.extras.tar.xz 4060 BLAKE2B a94b8799f6c1d338a17e25b1dde6aa616754bfde092eb5ad1da11a6ec8b1107dce827d05ecc756a4918339329190e6572bb089de89d9a11c8c08f067eb7b269d SHA512 1a166a0054827ac9bef700d075cc2a1e3934dbe7b7aa64b34109b521f5bb21e231d59be4643f6faf702e5d0b3cb7d82e8cc1ba1f77e3bf88c38f9b6ffc61e35f
-DIST genpatches-6.12-8.base.tar.xz 575036 BLAKE2B aa22e2f16cec22a76f2ccba2acd9d55b66a93851e01d2cf0af19e9904c6210550ece4699e19918a88f8ed5d5e78dd5d81afdd2a94541ec97d349bfebae26835c SHA512 4251ebdbcec4649663541c8dba7eaed3b674612aeb68a0cbef94e0d0ea5820370a8996f33c316a3fcd6ee94eafb489dc32a22504e94843a71f464a3650647e1c
-DIST genpatches-6.12-8.experimental.tar.xz 78140 BLAKE2B 06a6d6fb6c6ffdeff130181d643881fa901aba258be61c069287b35d8a90f899288418a5d9f53806b828e3313b0d0772ff7fe5e19fd76625e908326faa377a91 SHA512 4a4f47cbb4515b0a8d54326bd2d1b57d8fc9166332e024967b870af8df2740a6aa9aa7c4c811506d2bafee3c1e3e804e3b7271fafe219915acd8ef45af291c4d
-DIST genpatches-6.12-8.extras.tar.xz 4056 BLAKE2B e6aa730acecdbb82f7983e34df47db46f473a792d19b848d4e4a5d25b52bc7d247217a12f708698f0473ef6eae33eacc704bdb36053378ae8b86e4d80713421b SHA512 c9da9965144e3adc7cc6d0168a1fcfb8165102ccaec2cdb9c4fc909d8e2002578263e12f1c2f56f21ec3b9d2d7a0a69b53dcd7d9dccbe40a9417ca0f6cfb43cb
+DIST genpatches-6.12-9.base.tar.xz 632912 BLAKE2B ed4f40958b1e3069213b309ef89bd7bab5aa7e9d5459fa35517ded1d2347abd4eea399c9df134989157e7b7a7ad68c3e777503884b9d7757be91ace970fb258e SHA512 cfdd660147ae7e686972d7ddaa1511fa4acfb1b5b4f9def30e8d11b5ae230a01fc0e1cb48c7af12b7fed435993936c0413cdfa9c41ecb354130db0ea4a653a0b
+DIST genpatches-6.12-9.experimental.tar.xz 78116 BLAKE2B fbd986e5185250b33abc1b77742996639e5b04a77d6e0c5802929d528d47dea61ae33ee515c95207963adc7705e875ea564273615e137ca28a04d6b0a675c488 SHA512 762f6e889e3ec9426005970cc5b8855111cafea6df889c301814924e46fd191ec63e5dec120b6bebeae890758da1aa927d0ebdb947f3dc580771fac05a345204
+DIST genpatches-6.12-9.extras.tar.xz 4056 BLAKE2B 718d47c2cb619bb1fab14dcf5c06d8137a3f778c728f50e6fd29972efaf0472b040e73cd88a510f35f53e3dcd1fac9a3c4cf5e16cc79d2c6a5ca384e1e2e9056 SHA512 d72cd080d56966d797a61f6b61bc471451296213475aa1b666ad58f8498657500641adc136ff7d07d3607f9eed2da4a0466877e423f67887bfd19a01f17a3aec
 DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56 SHA512 f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502
 DIST kernel-aarch64-fedora.config.6.11.5-gentoo 285046 BLAKE2B e8ae27d70fa023976e950d4edcb38963e2fff39efa5cd1ff5922278e871efe6e6cda11c609e721eb2a3f7b030ea75447be384065d3b177000c301fc287a34d7f SHA512 121bbeebace3b760ff6ef36cf9970def3073966ea2fc1089c19c08d27a0524502dedc8c988c5239e78ce04caea6feb5ba7b5d53e0319b22ba63ce6cbc2a07e75
 DIST kernel-aarch64-fedora.config.6.12.1-gentoo 287989 BLAKE2B fbf6183487ffc6d30543c6b9caedbca224cc9ce4ec917e35ab351030212b721af8cc33aafa1feb229a1d6b45c9f45329f8e4957bdb3d43bee7ac223eeb90a994 SHA512 fad6121dfe4a3c82039cfe77614e90b4a954fe12d156f29ef9a596745327a3d30c7a40fc4002405a692685c7deaf9a7d3d6f944d505bc51ed5c387f9c9fd6311
@@ -16,4 +16,4 @@ DIST kernel-x86_64-fedora.config.6.12.1-gentoo 256170 BLAKE2B 39e03735453c66f426
 DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea
 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
 DIST linux-hardened-v6.11.8-hardened1.patch 95386 BLAKE2B c8afa1a25191e73d0a1208ce3bc7dea7d856d2697adcd3f5a9d1ec9695f393aa42099353699c1f58dd056c6fb4215860661a6a17358c887877612ac58a4cf3f6 SHA512 d5baa895f069af8e8f3e6d605e86e10137de6a3d956d8dc092e6c3ed4c52ae6faa9dc10dce2bee6696a75e0d7e595f912e06f64a36965ef282918145567597b3
-DIST linux-hardened-v6.12.5-hardened1.patch 89620 BLAKE2B 87bebf2c3e8d2530c4a818f803cf7941cdb5d336acbaccf9bc5d8decdd876df13eb3f6133afaa10ad13aaa50d373804b357fd12d577cd5fc1ee83611c65ebd5f SHA512 8c148bf4875bec7f3b6ba7cc9e4b39b67ecf9c72adf218e58577923f7136e4270b03fe2dcde5fab4a1558a840c9d982f581ee8d615768cba73a53fe60864fb94
+DIST linux-hardened-v6.12.6-hardened1.patch 89620 BLAKE2B e33fc43320fa1b042370d7f708fd48fd7d0dd948ae3721b70400e4528f624e801fbcd56cac2ca1c8322397a9386e7e7de6a9c5085a3dcaa55b4a84ad2bd16dfb SHA512 1908cae710869e4f8b51df11ce0f71769e0f87619e0a1f8f224d77c492c6a7bed4192db6cc47eb129857f8bf1a354ccf2e997243fd3cc86c9917ea7e23da6613
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0001-bcachefs-kill-retry_estale-in-bch2_ioctl_subvolume_c.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0001-bcachefs-kill-retry_estale-in-bch2_ioctl_subvolume_c.patch
index 26b85cf..0df6e54 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0001-bcachefs-kill-retry_estale-in-bch2_ioctl_subvolume_c.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0001-bcachefs-kill-retry_estale-in-bch2_ioctl_subvolume_c.patch
@@ -1,7 +1,7 @@
 From 3d1ea1c0aeaf7baaf0c0a3d073a49671dfd3771a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 11 Oct 2024 16:21:14 -0400
-Subject: [PATCH 001/213] bcachefs: kill retry_estale() in
+Subject: [PATCH 001/233] bcachefs: kill retry_estale() in
  bch2_ioctl_subvolume_create()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0002-bcachefs-Fix-racy-use-of-jiffies.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0002-bcachefs-Fix-racy-use-of-jiffies.patch
index c645e55..0b31b32 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0002-bcachefs-Fix-racy-use-of-jiffies.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0002-bcachefs-Fix-racy-use-of-jiffies.patch
@@ -1,7 +1,7 @@
 From 40cfa4d5b8dcf25ae12c8fca492212e0a2b1d2cc Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 9 Oct 2024 16:53:59 -0400
-Subject: [PATCH 002/213] bcachefs: Fix racy use of jiffies
+Subject: [PATCH 002/233] bcachefs: Fix racy use of jiffies
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0003-bcachefs-remove-superfluous-after-statements.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0003-bcachefs-remove-superfluous-after-statements.patch
index 6ec26ac..992ad4c 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0003-bcachefs-remove-superfluous-after-statements.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0003-bcachefs-remove-superfluous-after-statements.patch
@@ -1,7 +1,7 @@
 From 61b2134ccc24a8843a1c9bc8bfd28bdfe88a0aab Mon Sep 17 00:00:00 2001
 From: Colin Ian King <colin.i.king@gmail.com>
 Date: Mon, 7 Oct 2024 09:11:21 +0100
-Subject: [PATCH 003/213] bcachefs: remove superfluous ; after statements
+Subject: [PATCH 003/233] bcachefs: remove superfluous ; after statements
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0004-bcachefs-bch2_inode_should_have_bp-bch2_inode_should.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0004-bcachefs-bch2_inode_should_have_bp-bch2_inode_should.patch
index e90693a..c105df1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0004-bcachefs-bch2_inode_should_have_bp-bch2_inode_should.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0004-bcachefs-bch2_inode_should_have_bp-bch2_inode_should.patch
@@ -1,7 +1,7 @@
 From cb9d3414d0b89b5b9803ea0531cbffe74925d54b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 28 Sep 2024 14:27:24 -0400
-Subject: [PATCH 004/213] bcachefs: bch2_inode_should_have_bp ->
+Subject: [PATCH 004/233] bcachefs: bch2_inode_should_have_bp ->
  bch2_inode_should_have_single_bp
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0005-bcachefs-remove_backpointer-now-uses-dirent_get_by_p.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0005-bcachefs-remove_backpointer-now-uses-dirent_get_by_p.patch
index 8d2854e..cf44684 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0005-bcachefs-remove_backpointer-now-uses-dirent_get_by_p.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0005-bcachefs-remove_backpointer-now-uses-dirent_get_by_p.patch
@@ -1,7 +1,7 @@
 From 61bf384a85f4ab4845a41762ca6aa91a18c67cca Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 1 Oct 2024 17:45:58 -0400
-Subject: [PATCH 005/213] bcachefs: remove_backpointer() now uses
+Subject: [PATCH 005/233] bcachefs: remove_backpointer() now uses
  dirent_get_by_pos()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0006-bcachefs-__bch2_key_has_snapshot_overwrites-uses-for.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0006-bcachefs-__bch2_key_has_snapshot_overwrites-uses-for.patch
index fde9e13..165ff7a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0006-bcachefs-__bch2_key_has_snapshot_overwrites-uses-for.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0006-bcachefs-__bch2_key_has_snapshot_overwrites-uses-for.patch
@@ -1,7 +1,7 @@
 From be40edadb0b715809f25bade2827af050ae6fbaa Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 30 Sep 2024 00:14:09 -0400
-Subject: [PATCH 006/213] bcachefs: __bch2_key_has_snapshot_overwrites uses
+Subject: [PATCH 006/233] bcachefs: __bch2_key_has_snapshot_overwrites uses
  for_each_btree_key_reverse_norestart()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0007-bcachefs-rcu_pending-don-t-invoke-__call_rcu-under-l.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0007-bcachefs-rcu_pending-don-t-invoke-__call_rcu-under-l.patch
index edb0051..0e39c78 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0007-bcachefs-rcu_pending-don-t-invoke-__call_rcu-under-l.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0007-bcachefs-rcu_pending-don-t-invoke-__call_rcu-under-l.patch
@@ -1,7 +1,7 @@
 From 1ef7af68e376ab89a6b8e49387f7a4bad4fc6657 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 22 Sep 2024 01:11:36 -0400
-Subject: [PATCH 007/213] bcachefs: rcu_pending: don't invoke __call_rcu()
+Subject: [PATCH 007/233] bcachefs: rcu_pending: don't invoke __call_rcu()
  under lock
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0008-bcachefs-bch_verbose_ratelimited.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0008-bcachefs-bch_verbose_ratelimited.patch
index 20c18b2..cc7d83b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0008-bcachefs-bch_verbose_ratelimited.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0008-bcachefs-bch_verbose_ratelimited.patch
@@ -1,7 +1,7 @@
 From bdb3bdcbc2ebcb2fc50be2c094184103b7ff5d30 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 28 Sep 2024 23:10:48 -0400
-Subject: [PATCH 008/213] bcachefs: bch_verbose_ratelimited
+Subject: [PATCH 008/233] bcachefs: bch_verbose_ratelimited
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0009-bcachefs-Pull-disk-accounting-hooks-out-of-trans_com.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0009-bcachefs-Pull-disk-accounting-hooks-out-of-trans_com.patch
index 641f28b..fa4a74f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0009-bcachefs-Pull-disk-accounting-hooks-out-of-trans_com.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0009-bcachefs-Pull-disk-accounting-hooks-out-of-trans_com.patch
@@ -1,7 +1,7 @@
 From 2aa08c451ebf753ed0170e1d8d05ac4b51221392 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 1 Oct 2024 16:59:08 -0400
-Subject: [PATCH 009/213] bcachefs: Pull disk accounting hooks out of
+Subject: [PATCH 009/233] bcachefs: Pull disk accounting hooks out of
  trans_commit.c
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0010-bcachefs-Delete-dead-code.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0010-bcachefs-Delete-dead-code.patch
index 7ab53dc..b579169 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0010-bcachefs-Delete-dead-code.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0010-bcachefs-Delete-dead-code.patch
@@ -1,7 +1,7 @@
 From 6952c5b0d70b70638a070f50668a614235a11175 Mon Sep 17 00:00:00 2001
 From: Alan Huang <mmpgouride@gmail.com>
 Date: Fri, 27 Sep 2024 22:26:53 +0800
-Subject: [PATCH 010/213] bcachefs: Delete dead code
+Subject: [PATCH 010/233] bcachefs: Delete dead code
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0011-bcachefs-move-bch2_xattr_handlers-to-.rodata.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0011-bcachefs-move-bch2_xattr_handlers-to-.rodata.patch
index 9d237a5..70bb7bc 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0011-bcachefs-move-bch2_xattr_handlers-to-.rodata.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0011-bcachefs-move-bch2_xattr_handlers-to-.rodata.patch
@@ -1,7 +1,7 @@
 From cf3d513801562174506425a79a9e71050f1d5d77 Mon Sep 17 00:00:00 2001
 From: Thomas Bertschinger <tahbertschinger@gmail.com>
 Date: Fri, 13 Sep 2024 18:11:22 -0600
-Subject: [PATCH 011/213] bcachefs: move bch2_xattr_handlers to .rodata
+Subject: [PATCH 011/233] bcachefs: move bch2_xattr_handlers to .rodata
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0012-bcachefs-Remove-unnecessary-peek_slot.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0012-bcachefs-Remove-unnecessary-peek_slot.patch
index 01e2fbf..1495e5f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0012-bcachefs-Remove-unnecessary-peek_slot.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0012-bcachefs-Remove-unnecessary-peek_slot.patch
@@ -1,7 +1,7 @@
 From 8ed4dcbbc3242c5c8004bb1ca5c1d47d0e8250f9 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 24 Sep 2024 05:08:39 -0400
-Subject: [PATCH 012/213] bcachefs: Remove unnecessary peek_slot()
+Subject: [PATCH 012/233] bcachefs: Remove unnecessary peek_slot()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0013-bcachefs-kill-btree_trans_restart_nounlock.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0013-bcachefs-kill-btree_trans_restart_nounlock.patch
index 1ec4d40..61aea8f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0013-bcachefs-kill-btree_trans_restart_nounlock.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0013-bcachefs-kill-btree_trans_restart_nounlock.patch
@@ -1,7 +1,7 @@
 From 250087e69e9c123ea58fba31cf301355ee6cb49a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 23 Sep 2024 22:11:41 -0400
-Subject: [PATCH 013/213] bcachefs: kill btree_trans_restart_nounlock()
+Subject: [PATCH 013/233] bcachefs: kill btree_trans_restart_nounlock()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0014-docs-filesystems-bcachefs-fixed-some-spelling-mistak.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0014-docs-filesystems-bcachefs-fixed-some-spelling-mistak.patch
index 3a735c5..b332144 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0014-docs-filesystems-bcachefs-fixed-some-spelling-mistak.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0014-docs-filesystems-bcachefs-fixed-some-spelling-mistak.patch
@@ -1,7 +1,7 @@
 From 43bf715a17c1be337b686fb4b5297739a704126e Mon Sep 17 00:00:00 2001
 From: Dennis Lam <dennis.lamerice@gmail.com>
 Date: Wed, 11 Sep 2024 21:16:28 -0400
-Subject: [PATCH 014/213] docs: filesystems: bcachefs: fixed some spelling
+Subject: [PATCH 014/233] docs: filesystems: bcachefs: fixed some spelling
  mistakes in the bcachefs coding style page
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0015-bcachefs-Remove-duplicate-included-headers.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0015-bcachefs-Remove-duplicate-included-headers.patch
index 4b03099..06cd359 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0015-bcachefs-Remove-duplicate-included-headers.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0015-bcachefs-Remove-duplicate-included-headers.patch
@@ -1,7 +1,7 @@
 From 0892d51393106dcb8c7d88cc2ee2f976d4a56c92 Mon Sep 17 00:00:00 2001
 From: Thorsten Blum <thorsten.blum@toblux.com>
 Date: Mon, 23 Sep 2024 16:20:29 +0200
-Subject: [PATCH 015/213] bcachefs: Remove duplicate included headers
+Subject: [PATCH 015/233] bcachefs: Remove duplicate included headers
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0016-bcachefs-Use-FOREACH_ACL_ENTRY-macro-to-iterate-over.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0016-bcachefs-Use-FOREACH_ACL_ENTRY-macro-to-iterate-over.patch
index 7b042c8..a14c9f7 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0016-bcachefs-Use-FOREACH_ACL_ENTRY-macro-to-iterate-over.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0016-bcachefs-Use-FOREACH_ACL_ENTRY-macro-to-iterate-over.patch
@@ -1,7 +1,7 @@
 From e4753128a6cfda251b1dcb95320735c0a2e036c8 Mon Sep 17 00:00:00 2001
 From: Thorsten Blum <thorsten.blum@linux.dev>
 Date: Mon, 23 Sep 2024 16:44:53 +0200
-Subject: [PATCH 016/213] bcachefs: Use FOREACH_ACL_ENTRY() macro to iterate
+Subject: [PATCH 016/233] bcachefs: Use FOREACH_ACL_ENTRY() macro to iterate
  over acl entries
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0017-bcachefs-add-more-path-idx-debug-asserts.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0017-bcachefs-add-more-path-idx-debug-asserts.patch
index 407f613..e2c496a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0017-bcachefs-add-more-path-idx-debug-asserts.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0017-bcachefs-add-more-path-idx-debug-asserts.patch
@@ -1,7 +1,7 @@
 From aab94e92a9b24c17443295df539631c0bf2306bb Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 23 Sep 2024 18:11:07 -0400
-Subject: [PATCH 017/213] bcachefs: add more path idx debug asserts
+Subject: [PATCH 017/233] bcachefs: add more path idx debug asserts
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0018-bcachefs-bch2_run_explicit_recovery_pass-returns-dif.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0018-bcachefs-bch2_run_explicit_recovery_pass-returns-dif.patch
index 75da283..747d28e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0018-bcachefs-bch2_run_explicit_recovery_pass-returns-dif.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0018-bcachefs-bch2_run_explicit_recovery_pass-returns-dif.patch
@@ -1,7 +1,7 @@
 From 31308cdd120cb7df3efd2c90f62c4fc735d7cc43 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 21 Sep 2024 20:21:18 -0400
-Subject: [PATCH 018/213] bcachefs: bch2_run_explicit_recovery_pass() returns
+Subject: [PATCH 018/233] bcachefs: bch2_run_explicit_recovery_pass() returns
  different error when not in recovery
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0019-bcachefs-lru-accounting-are-alloc-btrees.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0019-bcachefs-lru-accounting-are-alloc-btrees.patch
index f246ba5..2af7b4f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0019-bcachefs-lru-accounting-are-alloc-btrees.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0019-bcachefs-lru-accounting-are-alloc-btrees.patch
@@ -1,7 +1,7 @@
 From f5037ae0441bc26678836db41693086b6eddd2ea Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 21 Sep 2024 23:22:48 -0400
-Subject: [PATCH 019/213] bcachefs: lru, accounting are alloc btrees
+Subject: [PATCH 019/233] bcachefs: lru, accounting are alloc btrees
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0020-bcachefs-Add-locking-for-bch_fs.curr_recovery_pass.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0020-bcachefs-Add-locking-for-bch_fs.curr_recovery_pass.patch
index 21af1a9..73595a8 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0020-bcachefs-Add-locking-for-bch_fs.curr_recovery_pass.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0020-bcachefs-Add-locking-for-bch_fs.curr_recovery_pass.patch
@@ -1,7 +1,7 @@
 From f5e8d0269ca9ef941bda37f57d0af1dc2ede1546 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 21 Sep 2024 23:27:59 -0400
-Subject: [PATCH 020/213] bcachefs: Add locking for bch_fs.curr_recovery_pass
+Subject: [PATCH 020/233] bcachefs: Add locking for bch_fs.curr_recovery_pass
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0021-bcachefs-bch2_btree_lost_data-now-uses-run_explicit_.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0021-bcachefs-bch2_btree_lost_data-now-uses-run_explicit_.patch
index f19d584..60254f5 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0021-bcachefs-bch2_btree_lost_data-now-uses-run_explicit_.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0021-bcachefs-bch2_btree_lost_data-now-uses-run_explicit_.patch
@@ -1,7 +1,7 @@
 From 771bf65862db8911c5368bf47410c629928562e4 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 21 Sep 2024 23:40:01 -0400
-Subject: [PATCH 021/213] bcachefs: bch2_btree_lost_data() now uses
+Subject: [PATCH 021/233] bcachefs: bch2_btree_lost_data() now uses
  run_explicit_rceovery_pass_persistent()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0022-bcachefs-improved-bkey_val_copy.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0022-bcachefs-improved-bkey_val_copy.patch
index e79f7c2..7c5e0f9 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0022-bcachefs-improved-bkey_val_copy.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0022-bcachefs-improved-bkey_val_copy.patch
@@ -1,7 +1,7 @@
 From 703b8d61ec2cef306f5379847adc089069333897 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 9 Oct 2024 21:26:05 -0400
-Subject: [PATCH 022/213] bcachefs: improved bkey_val_copy()
+Subject: [PATCH 022/233] bcachefs: improved bkey_val_copy()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0023-bcachefs-Factor-out-jset_entry_log_msg_bytes.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0023-bcachefs-Factor-out-jset_entry_log_msg_bytes.patch
index be019cc..3f74fbd 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0023-bcachefs-Factor-out-jset_entry_log_msg_bytes.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0023-bcachefs-Factor-out-jset_entry_log_msg_bytes.patch
@@ -1,7 +1,7 @@
 From 7d6273caeac4a7389272be2c870562308753656a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 9 Oct 2024 21:51:05 -0400
-Subject: [PATCH 023/213] bcachefs: Factor out jset_entry_log_msg_bytes()
+Subject: [PATCH 023/233] bcachefs: Factor out jset_entry_log_msg_bytes()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0024-bcachefs-better-error-message-in-check_snapshot_tree.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0024-bcachefs-better-error-message-in-check_snapshot_tree.patch
index eda6a00..7a5c5cb 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0024-bcachefs-better-error-message-in-check_snapshot_tree.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0024-bcachefs-better-error-message-in-check_snapshot_tree.patch
@@ -1,7 +1,7 @@
 From a1fbdad42fc52ff038183644e39785525553e667 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 9 Oct 2024 21:27:11 -0400
-Subject: [PATCH 024/213] bcachefs: better error message in
+Subject: [PATCH 024/233] bcachefs: better error message in
  check_snapshot_tree()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0025-bcachefs-Avoid-bch2_btree_id_str.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0025-bcachefs-Avoid-bch2_btree_id_str.patch
index b7e63e6..ac77cf5 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0025-bcachefs-Avoid-bch2_btree_id_str.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0025-bcachefs-Avoid-bch2_btree_id_str.patch
@@ -1,7 +1,7 @@
 From 78cf5d12ae82115f913292e8e4fa35e73161504a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 9 Oct 2024 23:02:04 -0400
-Subject: [PATCH 025/213] bcachefs: Avoid bch2_btree_id_str()
+Subject: [PATCH 025/233] bcachefs: Avoid bch2_btree_id_str()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0026-bcachefs-Refactor-new-stripe-path-to-reduce-dependen.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0026-bcachefs-Refactor-new-stripe-path-to-reduce-dependen.patch
index 1fc8382..f34d924 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0026-bcachefs-Refactor-new-stripe-path-to-reduce-dependen.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0026-bcachefs-Refactor-new-stripe-path-to-reduce-dependen.patch
@@ -1,7 +1,7 @@
 From 09115483e7432d20c72e382662c0dffd603cc6b5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 1 Sep 2024 14:57:26 -0400
-Subject: [PATCH 026/213] bcachefs: Refactor new stripe path to reduce
+Subject: [PATCH 026/233] bcachefs: Refactor new stripe path to reduce
  dependencies on ec_stripe_head
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0027-bcachefs-o-norecovery-now-bails-out-of-recovery-earl.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0027-bcachefs-o-norecovery-now-bails-out-of-recovery-earl.patch
index fd7c884..e728061 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0027-bcachefs-o-norecovery-now-bails-out-of-recovery-earl.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0027-bcachefs-o-norecovery-now-bails-out-of-recovery-earl.patch
@@ -1,7 +1,7 @@
 From cca1dff8fea3f4ebe8a7f39a109d14a0f136d319 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 11 Oct 2024 22:53:09 -0400
-Subject: [PATCH 027/213] bcachefs: -o norecovery now bails out of recovery
+Subject: [PATCH 027/233] bcachefs: -o norecovery now bails out of recovery
  earlier
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0028-bcachefs-bch2_journal_meta-takes-ref-on-c-writes.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0028-bcachefs-bch2_journal_meta-takes-ref-on-c-writes.patch
index 0f0cda4..704007f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0028-bcachefs-bch2_journal_meta-takes-ref-on-c-writes.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0028-bcachefs-bch2_journal_meta-takes-ref-on-c-writes.patch
@@ -1,7 +1,7 @@
 From a99869f0b74e8ced83ece54c3f1645363fe8214c Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 11 Oct 2024 22:50:48 -0400
-Subject: [PATCH 028/213] bcachefs: bch2_journal_meta() takes ref on c->writes
+Subject: [PATCH 028/233] bcachefs: bch2_journal_meta() takes ref on c->writes
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0029-bcachefs-Fix-warning-about-passing-flex-array-member.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0029-bcachefs-Fix-warning-about-passing-flex-array-member.patch
index 90d663a..db5628f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0029-bcachefs-Fix-warning-about-passing-flex-array-member.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0029-bcachefs-Fix-warning-about-passing-flex-array-member.patch
@@ -1,7 +1,7 @@
 From c4bfe7049c62651c7e03210760529e2fab9a7706 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 12 Oct 2024 14:07:44 -0400
-Subject: [PATCH 029/213] bcachefs: Fix warning about passing flex array member
+Subject: [PATCH 029/233] bcachefs: Fix warning about passing flex array member
  by value
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0030-bcachefs-Add-block-plugging-to-read-paths.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0030-bcachefs-Add-block-plugging-to-read-paths.patch
index e54e30e..a3d68e9 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0030-bcachefs-Add-block-plugging-to-read-paths.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0030-bcachefs-Add-block-plugging-to-read-paths.patch
@@ -1,7 +1,7 @@
 From b6a562e6d87918faaacea4999d47ae4e0da2f5f0 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 14 Oct 2024 21:35:44 -0400
-Subject: [PATCH 030/213] bcachefs: Add block plugging to read paths
+Subject: [PATCH 030/233] bcachefs: Add block plugging to read paths
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0031-bcachefs-Add-version-check-for-bch_btree_ptr_v2.sect.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0031-bcachefs-Add-version-check-for-bch_btree_ptr_v2.sect.patch
index ed4da0d..536aa32 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0031-bcachefs-Add-version-check-for-bch_btree_ptr_v2.sect.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0031-bcachefs-Add-version-check-for-bch_btree_ptr_v2.sect.patch
@@ -1,7 +1,7 @@
 From ce612d0d48ce2143fc0394c7fbf5eb1f5944a25f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 19:02:44 -0400
-Subject: [PATCH 031/213] bcachefs: Add version check for
+Subject: [PATCH 031/233] bcachefs: Add version check for
  bch_btree_ptr_v2.sectors_written validate
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0032-bcachefs-Use-str_write_read-helper-function.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0032-bcachefs-Use-str_write_read-helper-function.patch
index 2484355..a2007a0 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0032-bcachefs-Use-str_write_read-helper-function.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0032-bcachefs-Use-str_write_read-helper-function.patch
@@ -1,7 +1,7 @@
 From d953b409bc8685f21315799bc3b32448945cc27f Mon Sep 17 00:00:00 2001
 From: Thorsten Blum <thorsten.blum@linux.dev>
 Date: Sat, 19 Oct 2024 14:25:27 +0200
-Subject: [PATCH 032/213] bcachefs: Use str_write_read() helper function
+Subject: [PATCH 032/233] bcachefs: Use str_write_read() helper function
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0033-bcachefs-Use-str_write_read-helper-in-ec_block_endio.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0033-bcachefs-Use-str_write_read-helper-in-ec_block_endio.patch
index 2ca68c8..3ab6c06 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0033-bcachefs-Use-str_write_read-helper-in-ec_block_endio.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0033-bcachefs-Use-str_write_read-helper-in-ec_block_endio.patch
@@ -1,7 +1,7 @@
 From dfce49250859cf87c267cf3952dadf8d702ff674 Mon Sep 17 00:00:00 2001
 From: Thorsten Blum <thorsten.blum@linux.dev>
 Date: Sun, 20 Oct 2024 13:20:46 +0200
-Subject: [PATCH 033/213] bcachefs: Use str_write_read() helper in
+Subject: [PATCH 033/233] bcachefs: Use str_write_read() helper in
  ec_block_endio()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0034-bcachefs-Use-str_write_read-helper-in-write_super_en.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0034-bcachefs-Use-str_write_read-helper-in-write_super_en.patch
index 2ed1150..c99427b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0034-bcachefs-Use-str_write_read-helper-in-write_super_en.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0034-bcachefs-Use-str_write_read-helper-in-write_super_en.patch
@@ -1,7 +1,7 @@
 From 342a485f4e29ecfdcf979af0b2e609cbdc52701d Mon Sep 17 00:00:00 2001
 From: Thorsten Blum <thorsten.blum@linux.dev>
 Date: Sat, 26 Oct 2024 12:47:23 +0200
-Subject: [PATCH 034/213] bcachefs: Use str_write_read() helper in
+Subject: [PATCH 034/233] bcachefs: Use str_write_read() helper in
  write_super_endio()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0035-bcachefs-Annotate-struct-bucket_gens-with-__counted_.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0035-bcachefs-Annotate-struct-bucket_gens-with-__counted_.patch
index 7cfd763..4429a75 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0035-bcachefs-Annotate-struct-bucket_gens-with-__counted_.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0035-bcachefs-Annotate-struct-bucket_gens-with-__counted_.patch
@@ -1,7 +1,7 @@
 From caaf27392849abbc6499196fcd114da3f11e4e0f Mon Sep 17 00:00:00 2001
 From: Thorsten Blum <thorsten.blum@linux.dev>
 Date: Sat, 26 Oct 2024 17:47:04 +0200
-Subject: [PATCH 035/213] bcachefs: Annotate struct bucket_gens with
+Subject: [PATCH 035/233] bcachefs: Annotate struct bucket_gens with
  __counted_by()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0036-bcachefs-avoid-unsigned-flags.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0036-bcachefs-avoid-unsigned-flags.patch
index a1ffd8f..fdf08bc 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0036-bcachefs-avoid-unsigned-flags.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0036-bcachefs-avoid-unsigned-flags.patch
@@ -1,7 +1,7 @@
 From 104688e7ed283a31735c61f4c3f95c339df42f8f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 01:11:29 -0400
-Subject: [PATCH 036/213] bcachefs: avoid 'unsigned flags'
+Subject: [PATCH 036/233] bcachefs: avoid 'unsigned flags'
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0037-bcachefs-use-bch2_data_update_opts_to_text-in-trace_.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0037-bcachefs-use-bch2_data_update_opts_to_text-in-trace_.patch
index e6d1915..514afec 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0037-bcachefs-use-bch2_data_update_opts_to_text-in-trace_.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0037-bcachefs-use-bch2_data_update_opts_to_text-in-trace_.patch
@@ -1,7 +1,7 @@
 From e86231fc642b4d428c941fbd8285ca66873375db Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 01:16:16 -0400
-Subject: [PATCH 037/213] bcachefs: use bch2_data_update_opts_to_text() in
+Subject: [PATCH 037/233] bcachefs: use bch2_data_update_opts_to_text() in
  trace_move_extent_fail()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0038-bcachefs-bch2_io_opts_fixups.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0038-bcachefs-bch2_io_opts_fixups.patch
index bb88dc4..291651a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0038-bcachefs-bch2_io_opts_fixups.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0038-bcachefs-bch2_io_opts_fixups.patch
@@ -1,7 +1,7 @@
 From 7813e014b5c83791825eff8850c42bd9dfe25471 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 01:21:43 -0400
-Subject: [PATCH 038/213] bcachefs: bch2_io_opts_fixups()
+Subject: [PATCH 038/233] bcachefs: bch2_io_opts_fixups()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0039-bcachefs-small-cleanup-for-extent-ptr-bitmasks.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0039-bcachefs-small-cleanup-for-extent-ptr-bitmasks.patch
index dbd2a8a..a27c900 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0039-bcachefs-small-cleanup-for-extent-ptr-bitmasks.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0039-bcachefs-small-cleanup-for-extent-ptr-bitmasks.patch
@@ -1,7 +1,7 @@
 From 88c26043ea0b7fb1d68b5e7ca2befc1e3077020b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 01:32:55 -0400
-Subject: [PATCH 039/213] bcachefs: small cleanup for extent ptr bitmasks
+Subject: [PATCH 039/233] bcachefs: small cleanup for extent ptr bitmasks
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0040-bcachefs-kill-bch2_bkey_needs_rebalance.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0040-bcachefs-kill-bch2_bkey_needs_rebalance.patch
index 12995b2..13d1645 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0040-bcachefs-kill-bch2_bkey_needs_rebalance.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0040-bcachefs-kill-bch2_bkey_needs_rebalance.patch
@@ -1,7 +1,7 @@
 From ef92eb2a63e2a1ae573455c11784519fee7bd70c Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 01:40:19 -0400
-Subject: [PATCH 040/213] bcachefs: kill bch2_bkey_needs_rebalance()
+Subject: [PATCH 040/233] bcachefs: kill bch2_bkey_needs_rebalance()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0041-bcachefs-kill-__bch2_bkey_sectors_need_rebalance.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0041-bcachefs-kill-__bch2_bkey_sectors_need_rebalance.patch
index 794285b..ed65e78 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0041-bcachefs-kill-__bch2_bkey_sectors_need_rebalance.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0041-bcachefs-kill-__bch2_bkey_sectors_need_rebalance.patch
@@ -1,7 +1,7 @@
 From 48cc0c6bed2eb17b1bba38273cb257533a83c408 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 02:14:53 -0400
-Subject: [PATCH 041/213] bcachefs: kill __bch2_bkey_sectors_need_rebalance()
+Subject: [PATCH 041/233] bcachefs: kill __bch2_bkey_sectors_need_rebalance()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0042-bcachefs-rename-bch_extent_rebalance-fields-to-match.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0042-bcachefs-rename-bch_extent_rebalance-fields-to-match.patch
index e609d3a..f5c513f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0042-bcachefs-rename-bch_extent_rebalance-fields-to-match.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0042-bcachefs-rename-bch_extent_rebalance-fields-to-match.patch
@@ -1,7 +1,7 @@
 From 875a3128db4cabe615187b9ca841b85bde923fd9 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 02:21:28 -0400
-Subject: [PATCH 042/213] bcachefs: rename bch_extent_rebalance fields to match
+Subject: [PATCH 042/233] bcachefs: rename bch_extent_rebalance fields to match
  other opts structs
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0043-bcachefs-io_opts_to_rebalance_opts.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0043-bcachefs-io_opts_to_rebalance_opts.patch
index 22a27fc..8da15b1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0043-bcachefs-io_opts_to_rebalance_opts.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0043-bcachefs-io_opts_to_rebalance_opts.patch
@@ -1,7 +1,7 @@
 From bdad263284332336642784929b9e4bf3887560b8 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 02:28:51 -0400
-Subject: [PATCH 043/213] bcachefs: io_opts_to_rebalance_opts()
+Subject: [PATCH 043/233] bcachefs: io_opts_to_rebalance_opts()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0044-bcachefs-Add-bch_io_opts-fields-for-indicating-wheth.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0044-bcachefs-Add-bch_io_opts-fields-for-indicating-wheth.patch
index 823524c..52f7a5e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0044-bcachefs-Add-bch_io_opts-fields-for-indicating-wheth.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0044-bcachefs-Add-bch_io_opts-fields-for-indicating-wheth.patch
@@ -1,7 +1,7 @@
 From fc23ffb93c5ba25558186bb77216ad0d1baf59b5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 19 Oct 2024 23:26:11 -0400
-Subject: [PATCH 044/213] bcachefs: Add bch_io_opts fields for indicating
+Subject: [PATCH 044/233] bcachefs: Add bch_io_opts fields for indicating
  whether the opts came from the inode
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0045-bcachefs-copygc_enabled-rebalance_enabled-now-opts.h.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0045-bcachefs-copygc_enabled-rebalance_enabled-now-opts.h.patch
index e6a8241..d89c51c 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0045-bcachefs-copygc_enabled-rebalance_enabled-now-opts.h.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0045-bcachefs-copygc_enabled-rebalance_enabled-now-opts.h.patch
@@ -1,7 +1,7 @@
 From 86066b111be8a1ef502332ab0511d2cf65766bcd Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 24 Oct 2024 01:06:53 -0400
-Subject: [PATCH 045/213] bcachefs: copygc_enabled, rebalance_enabled now
+Subject: [PATCH 045/233] bcachefs: copygc_enabled, rebalance_enabled now
  opts.h options
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0046-bcachefs-bch2_prt_csum_opt.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0046-bcachefs-bch2_prt_csum_opt.patch
index 2463f2c..7705a28 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0046-bcachefs-bch2_prt_csum_opt.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0046-bcachefs-bch2_prt_csum_opt.patch
@@ -1,7 +1,7 @@
 From e1d67b5d67f83789f0cf57d8c822941a5050a454 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 28 Oct 2024 01:14:53 -0400
-Subject: [PATCH 046/213] bcachefs: bch2_prt_csum_opt()
+Subject: [PATCH 046/233] bcachefs: bch2_prt_csum_opt()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0047-bcachefs-New-bch_extent_rebalance-fields.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0047-bcachefs-New-bch_extent_rebalance-fields.patch
index 9c8e807..90d61a5 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0047-bcachefs-New-bch_extent_rebalance-fields.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0047-bcachefs-New-bch_extent_rebalance-fields.patch
@@ -1,7 +1,7 @@
 From a5fe1d1656b8471db2cd0854062977245aadd80a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 19 Oct 2024 21:41:20 -0400
-Subject: [PATCH 047/213] bcachefs: New bch_extent_rebalance fields
+Subject: [PATCH 047/233] bcachefs: New bch_extent_rebalance fields
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0048-bcachefs-bch2_write_inode-now-checks-for-changing-re.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0048-bcachefs-bch2_write_inode-now-checks-for-changing-re.patch
index d399b66..7fa82e1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0048-bcachefs-bch2_write_inode-now-checks-for-changing-re.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0048-bcachefs-bch2_write_inode-now-checks-for-changing-re.patch
@@ -1,7 +1,7 @@
 From e2aeaaa5c9eee014aba96c54c6730d016c00ca67 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 20:53:53 -0400
-Subject: [PATCH 048/213] bcachefs: bch2_write_inode() now checks for changing
+Subject: [PATCH 048/233] bcachefs: bch2_write_inode() now checks for changing
  rebalance options
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0049-bcachefs-get_update_rebalance_opts.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0049-bcachefs-get_update_rebalance_opts.patch
index ab2fd0d..0418b72 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0049-bcachefs-get_update_rebalance_opts.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0049-bcachefs-get_update_rebalance_opts.patch
@@ -1,7 +1,7 @@
 From f14488c8cf907f1d69716465c9c8ab11b9ff2261 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 19 Oct 2024 21:41:20 -0400
-Subject: [PATCH 049/213] bcachefs: get_update_rebalance_opts()
+Subject: [PATCH 049/233] bcachefs: get_update_rebalance_opts()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0050-bcachefs-Simplify-option-logic-in-rebalance.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0050-bcachefs-Simplify-option-logic-in-rebalance.patch
index 55c5048..cce4910 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0050-bcachefs-Simplify-option-logic-in-rebalance.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0050-bcachefs-Simplify-option-logic-in-rebalance.patch
@@ -1,7 +1,7 @@
 From 8aa17c262842fedae48ab6b38e63284664971560 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 19 Oct 2024 21:41:20 -0400
-Subject: [PATCH 050/213] bcachefs: Simplify option logic in rebalance
+Subject: [PATCH 050/233] bcachefs: Simplify option logic in rebalance
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0051-bcachefs-Improve-trace_rebalance_extent.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0051-bcachefs-Improve-trace_rebalance_extent.patch
index 8677663..bfd5b93 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0051-bcachefs-Improve-trace_rebalance_extent.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0051-bcachefs-Improve-trace_rebalance_extent.patch
@@ -1,7 +1,7 @@
 From 9cf36d9f4d281af3dc65f1e819f5ec84613db899 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 26 Oct 2024 01:42:57 -0400
-Subject: [PATCH 051/213] bcachefs: Improve trace_rebalance_extent
+Subject: [PATCH 051/233] bcachefs: Improve trace_rebalance_extent
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0052-bcachefs-Move-bch_extent_rebalance-code-to-rebalance.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0052-bcachefs-Move-bch_extent_rebalance-code-to-rebalance.patch
index 0d065d0..d370802 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0052-bcachefs-Move-bch_extent_rebalance-code-to-rebalance.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0052-bcachefs-Move-bch_extent_rebalance-code-to-rebalance.patch
@@ -1,7 +1,7 @@
 From f6240723f7d66143b5a74b620666795112162b4f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 28 Oct 2024 23:23:18 -0400
-Subject: [PATCH 052/213] bcachefs: Move bch_extent_rebalance code to
+Subject: [PATCH 052/233] bcachefs: Move bch_extent_rebalance code to
  rebalance.c
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0053-bcachefs-remove-write-permission-for-gc_gens_pos-sys.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0053-bcachefs-remove-write-permission-for-gc_gens_pos-sys.patch
index 8730c11..aafccc5 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0053-bcachefs-remove-write-permission-for-gc_gens_pos-sys.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0053-bcachefs-remove-write-permission-for-gc_gens_pos-sys.patch
@@ -1,7 +1,7 @@
 From 9e6755da18a187eb1389a205680049587d97c62a Mon Sep 17 00:00:00 2001
 From: Hongbo Li <lihongbo22@huawei.com>
 Date: Tue, 29 Oct 2024 20:53:50 +0800
-Subject: [PATCH 053/213] bcachefs: remove write permission for gc_gens_pos
+Subject: [PATCH 053/233] bcachefs: remove write permission for gc_gens_pos
  sysfs interface
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0054-bcachefs-use-attribute-define-helper-for-sysfs-attri.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0054-bcachefs-use-attribute-define-helper-for-sysfs-attri.patch
index 688e913..81caf0a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0054-bcachefs-use-attribute-define-helper-for-sysfs-attri.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0054-bcachefs-use-attribute-define-helper-for-sysfs-attri.patch
@@ -1,7 +1,7 @@
 From 3289204eca4e4f1f873ceb5630f855b66373576e Mon Sep 17 00:00:00 2001
 From: Hongbo Li <lihongbo22@huawei.com>
 Date: Tue, 29 Oct 2024 20:54:08 +0800
-Subject: [PATCH 054/213] bcachefs: use attribute define helper for sysfs
+Subject: [PATCH 054/233] bcachefs: use attribute define helper for sysfs
  attribute
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0055-bcachefs-Add-assert-for-use-of-journal-replay-keys-f.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0055-bcachefs-Add-assert-for-use-of-journal-replay-keys-f.patch
index 6378d5c..2907f78 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0055-bcachefs-Add-assert-for-use-of-journal-replay-keys-f.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0055-bcachefs-Add-assert-for-use-of-journal-replay-keys-f.patch
@@ -1,7 +1,7 @@
 From 0877e537bcecaaa8b2a7926a130fab809a83e6da Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 31 Oct 2024 03:35:41 -0400
-Subject: [PATCH 055/213] bcachefs: Add assert for use of journal replay keys
+Subject: [PATCH 055/233] bcachefs: Add assert for use of journal replay keys
  for updates
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0056-bcachefs-Kill-BCH_TRANS_COMMIT_lazy_rw.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0056-bcachefs-Kill-BCH_TRANS_COMMIT_lazy_rw.patch
index 6d8649c..0cfb523 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0056-bcachefs-Kill-BCH_TRANS_COMMIT_lazy_rw.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0056-bcachefs-Kill-BCH_TRANS_COMMIT_lazy_rw.patch
@@ -1,7 +1,7 @@
 From bf924eff0e7b0dff40eee7d9237e382918022f6a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 31 Oct 2024 03:39:32 -0400
-Subject: [PATCH 056/213] bcachefs: Kill BCH_TRANS_COMMIT_lazy_rw
+Subject: [PATCH 056/233] bcachefs: Kill BCH_TRANS_COMMIT_lazy_rw
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0057-bcachefs-Improved-check_topology-assert.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0057-bcachefs-Improved-check_topology-assert.patch
index 7c8dc7f..d4ee5ce 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0057-bcachefs-Improved-check_topology-assert.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0057-bcachefs-Improved-check_topology-assert.patch
@@ -1,7 +1,7 @@
 From 657e12389cdd2f954012666fd5a2ea336950bd56 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 31 Oct 2024 00:25:36 -0400
-Subject: [PATCH 057/213] bcachefs: Improved check_topology() assert
+Subject: [PATCH 057/233] bcachefs: Improved check_topology() assert
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0058-bcachefs-Fix-unhandled-transaction-restart-in-evacua.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0058-bcachefs-Fix-unhandled-transaction-restart-in-evacua.patch
index ec6125d..0f384cd 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0058-bcachefs-Fix-unhandled-transaction-restart-in-evacua.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0058-bcachefs-Fix-unhandled-transaction-restart-in-evacua.patch
@@ -1,7 +1,7 @@
 From e17c5f5f191f21665cc9e48cd68d92ef4cc377ef Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 7 Nov 2024 22:00:05 -0500
-Subject: [PATCH 058/213] bcachefs: Fix unhandled transaction restart in
+Subject: [PATCH 058/233] bcachefs: Fix unhandled transaction restart in
  evacuate_bucket()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0059-bcachefs-Assert-we-re-not-in-a-restart-in-bch2_trans.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0059-bcachefs-Assert-we-re-not-in-a-restart-in-bch2_trans.patch
index e4906d6..1ce3c32 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0059-bcachefs-Assert-we-re-not-in-a-restart-in-bch2_trans.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0059-bcachefs-Assert-we-re-not-in-a-restart-in-bch2_trans.patch
@@ -1,7 +1,7 @@
 From 58d33a0a41804c2ab68c85fc61f79e91f4b9f98b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 14 Oct 2024 23:33:57 -0400
-Subject: [PATCH 059/213] bcachefs: Assert we're not in a restart in
+Subject: [PATCH 059/233] bcachefs: Assert we're not in a restart in
  bch2_trans_put()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0060-bcachefs-Better-in_restart-error.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0060-bcachefs-Better-in_restart-error.patch
index 67e085c..cdd5e19 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0060-bcachefs-Better-in_restart-error.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0060-bcachefs-Better-in_restart-error.patch
@@ -1,7 +1,7 @@
 From efaa4e4ea6ceb2cdee4b0dca156e0606bbc98f8d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 14 Oct 2024 23:52:51 -0400
-Subject: [PATCH 060/213] bcachefs: Better in_restart error
+Subject: [PATCH 060/233] bcachefs: Better in_restart error
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0061-bcachefs-bch2_trans_verify_not_unlocked_or_in_restar.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0061-bcachefs-bch2_trans_verify_not_unlocked_or_in_restar.patch
index 08ec5b4..287ebc1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0061-bcachefs-bch2_trans_verify_not_unlocked_or_in_restar.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0061-bcachefs-bch2_trans_verify_not_unlocked_or_in_restar.patch
@@ -1,7 +1,7 @@
 From e398d6fb0f5aace9f5d181fab0b9dfb7c1025938 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 27 Oct 2024 19:32:40 -0400
-Subject: [PATCH 061/213] bcachefs:
+Subject: [PATCH 061/233] bcachefs:
  bch2_trans_verify_not_unlocked_or_in_restart()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0062-bcachefs-Assert-that-we-re-not-violating-key-cache-c.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0062-bcachefs-Assert-that-we-re-not-violating-key-cache-c.patch
index 0c52241..9b4a33d 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0062-bcachefs-Assert-that-we-re-not-violating-key-cache-c.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0062-bcachefs-Assert-that-we-re-not-violating-key-cache-c.patch
@@ -1,7 +1,7 @@
 From f97b3e7fd8f371eba3ae114eb8eb0dd3c6842771 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 25 Oct 2024 22:31:20 -0400
-Subject: [PATCH 062/213] bcachefs: Assert that we're not violating key cache
+Subject: [PATCH 062/233] bcachefs: Assert that we're not violating key cache
  coherency rules
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0063-bcachefs-Rename-btree_iter_peek_upto-btree_iter_peek.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0063-bcachefs-Rename-btree_iter_peek_upto-btree_iter_peek.patch
index 5b9fbd0..51dfb1b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0063-bcachefs-Rename-btree_iter_peek_upto-btree_iter_peek.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0063-bcachefs-Rename-btree_iter_peek_upto-btree_iter_peek.patch
@@ -1,7 +1,7 @@
 From 95918915a6d31158bbec7a2abd3eeffed4decab3 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 24 Oct 2024 18:39:59 -0400
-Subject: [PATCH 063/213] bcachefs: Rename btree_iter_peek_upto() ->
+Subject: [PATCH 063/233] bcachefs: Rename btree_iter_peek_upto() ->
  btree_iter_peek_max()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0064-bcachefs-Simplify-btree_iter_peek-filter_snapshots.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0064-bcachefs-Simplify-btree_iter_peek-filter_snapshots.patch
index 5e37e7f..6db343b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0064-bcachefs-Simplify-btree_iter_peek-filter_snapshots.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0064-bcachefs-Simplify-btree_iter_peek-filter_snapshots.patch
@@ -1,7 +1,7 @@
 From 0ad36d94fec984615bee1a89d402d8ad942b3eab Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 25 Oct 2024 01:48:26 -0400
-Subject: [PATCH 064/213] bcachefs: Simplify btree_iter_peek() filter_snapshots
+Subject: [PATCH 064/233] bcachefs: Simplify btree_iter_peek() filter_snapshots
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0065-bcachefs-Kill-unnecessary-iter_rewind-in-bkey_get_em.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0065-bcachefs-Kill-unnecessary-iter_rewind-in-bkey_get_em.patch
index fc706f3..3eff491 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0065-bcachefs-Kill-unnecessary-iter_rewind-in-bkey_get_em.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0065-bcachefs-Kill-unnecessary-iter_rewind-in-bkey_get_em.patch
@@ -1,7 +1,7 @@
 From 2cb00966dd7d318400633b66864ceb34dfdcfdc8 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 25 Oct 2024 22:16:19 -0400
-Subject: [PATCH 065/213] bcachefs: Kill unnecessary iter_rewind() in
+Subject: [PATCH 065/233] bcachefs: Kill unnecessary iter_rewind() in
  bkey_get_empty_slot()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0066-bcachefs-Move-fsck-ioctl-code-to-fsck.c.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0066-bcachefs-Move-fsck-ioctl-code-to-fsck.c.patch
index d3e2fe9..ac69d2a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0066-bcachefs-Move-fsck-ioctl-code-to-fsck.c.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0066-bcachefs-Move-fsck-ioctl-code-to-fsck.c.patch
@@ -1,7 +1,7 @@
 From 45f667488e390bd9771163eddbcdc304798f32a5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 6 Nov 2024 13:13:25 -0500
-Subject: [PATCH 066/213] bcachefs: Move fsck ioctl code to fsck.c
+Subject: [PATCH 066/233] bcachefs: Move fsck ioctl code to fsck.c
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0067-bcachefs-add-support-for-true-false-yes-no-in-bool-t.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0067-bcachefs-add-support-for-true-false-yes-no-in-bool-t.patch
index c2dcd33..583122c 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0067-bcachefs-add-support-for-true-false-yes-no-in-bool-t.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0067-bcachefs-add-support-for-true-false-yes-no-in-bool-t.patch
@@ -1,7 +1,7 @@
 From 88c2aa59c3f62a04f89a62985f9f0ece694fe066 Mon Sep 17 00:00:00 2001
 From: Integral <integral@murena.io>
 Date: Wed, 23 Oct 2024 18:00:33 +0800
-Subject: [PATCH 067/213] bcachefs: add support for true/false & yes/no in
+Subject: [PATCH 067/233] bcachefs: add support for true/false & yes/no in
  bool-type options
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0068-bcachefs-Correct-the-description-of-the-bucket-size-.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0068-bcachefs-Correct-the-description-of-the-bucket-size-.patch
index 5d62e01..c909400 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0068-bcachefs-Correct-the-description-of-the-bucket-size-.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0068-bcachefs-Correct-the-description-of-the-bucket-size-.patch
@@ -1,7 +1,7 @@
 From 19128c53d438d7435d855625e5abe6a0a929ae63 Mon Sep 17 00:00:00 2001
 From: Youling Tang <tangyouling@kylinos.cn>
 Date: Wed, 16 Oct 2024 09:50:26 +0800
-Subject: [PATCH 068/213] bcachefs: Correct the description of the
+Subject: [PATCH 068/233] bcachefs: Correct the description of the
  '--bucket=size' options
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0069-bcachefs-Add-support-for-FS_IOC_GETFSUUID.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0069-bcachefs-Add-support-for-FS_IOC_GETFSUUID.patch
index 7815aff..4bbe2e1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0069-bcachefs-Add-support-for-FS_IOC_GETFSUUID.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0069-bcachefs-Add-support-for-FS_IOC_GETFSUUID.patch
@@ -1,7 +1,7 @@
 From a57150fe53c1e85babe43129d047b502b0316765 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 9 Jul 2024 09:11:33 +0800
-Subject: [PATCH 069/213] bcachefs: Add support for FS_IOC_GETFSUUID
+Subject: [PATCH 069/233] bcachefs: Add support for FS_IOC_GETFSUUID
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0070-bcachefs-Add-support-for-FS_IOC_GETFSSYSFSPATH.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0070-bcachefs-Add-support-for-FS_IOC_GETFSSYSFSPATH.patch
index b3cd776..b575957 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0070-bcachefs-Add-support-for-FS_IOC_GETFSSYSFSPATH.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0070-bcachefs-Add-support-for-FS_IOC_GETFSSYSFSPATH.patch
@@ -1,7 +1,7 @@
 From 797a14eb7da2e1db8b8c768b62035f6567bf4b80 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 9 Jul 2024 09:11:34 +0800
-Subject: [PATCH 070/213] bcachefs: Add support for FS_IOC_GETFSSYSFSPATH
+Subject: [PATCH 070/233] bcachefs: Add support for FS_IOC_GETFSSYSFSPATH
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0071-bcachefs-Removes-NULL-pointer-checks-for-__filemap_g.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0071-bcachefs-Removes-NULL-pointer-checks-for-__filemap_g.patch
index 221da06..32b6172 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0071-bcachefs-Removes-NULL-pointer-checks-for-__filemap_g.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0071-bcachefs-Removes-NULL-pointer-checks-for-__filemap_g.patch
@@ -1,7 +1,7 @@
 From 0fe251fd827271cb8d40490db395ca9c58a21509 Mon Sep 17 00:00:00 2001
 From: Youling Tang <tangyouling@kylinos.cn>
 Date: Tue, 24 Sep 2024 10:53:50 +0800
-Subject: [PATCH 071/213] bcachefs: Removes NULL pointer checks for
+Subject: [PATCH 071/233] bcachefs: Removes NULL pointer checks for
  __filemap_get_folio return values
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0072-bcachefs-Remove-redundant-initialization-in-bch2_vfs.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0072-bcachefs-Remove-redundant-initialization-in-bch2_vfs.patch
index 0c65b1c..e677b43 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0072-bcachefs-Remove-redundant-initialization-in-bch2_vfs.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0072-bcachefs-Remove-redundant-initialization-in-bch2_vfs.patch
@@ -1,7 +1,7 @@
 From db6b114bd5c8426f9efa74209e987f3ff2a7bf5f Mon Sep 17 00:00:00 2001
 From: Youling Tang <tangyouling@kylinos.cn>
 Date: Fri, 27 Sep 2024 16:40:42 +0800
-Subject: [PATCH 072/213] bcachefs: Remove redundant initialization in
+Subject: [PATCH 072/233] bcachefs: Remove redundant initialization in
  bch2_vfs_inode_init()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0073-bcachefs-Simplify-code-in-bch2_dev_alloc.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0073-bcachefs-Simplify-code-in-bch2_dev_alloc.patch
index 894d046..bcbbd5f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0073-bcachefs-Simplify-code-in-bch2_dev_alloc.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0073-bcachefs-Simplify-code-in-bch2_dev_alloc.patch
@@ -1,7 +1,7 @@
 From c03828056d84e06f5687d296a2808b3ee5e4dfce Mon Sep 17 00:00:00 2001
 From: Youling Tang <tangyouling@kylinos.cn>
 Date: Wed, 16 Oct 2024 09:49:11 +0800
-Subject: [PATCH 073/213] bcachefs: Simplify code in bch2_dev_alloc()
+Subject: [PATCH 073/233] bcachefs: Simplify code in bch2_dev_alloc()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0074-bcachefs-Don-t-use-page-allocator-for-sb_read_scratc.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0074-bcachefs-Don-t-use-page-allocator-for-sb_read_scratc.patch
index 697b7ca..ef345f9 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0074-bcachefs-Don-t-use-page-allocator-for-sb_read_scratc.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0074-bcachefs-Don-t-use-page-allocator-for-sb_read_scratc.patch
@@ -1,7 +1,7 @@
 From 53f02a6929c291960b8d44540a7085940b82366d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 7 Nov 2024 19:15:38 -0500
-Subject: [PATCH 074/213] bcachefs: Don't use page allocator for
+Subject: [PATCH 074/233] bcachefs: Don't use page allocator for
  sb_read_scratch
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0075-bcachefs-Fix-shutdown-message.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0075-bcachefs-Fix-shutdown-message.patch
index 795ecbd..0c4eda2 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0075-bcachefs-Fix-shutdown-message.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0075-bcachefs-Fix-shutdown-message.patch
@@ -1,7 +1,7 @@
 From a0678f9c859bf25e60a535e65aff5864ccf66eb2 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 7 Nov 2024 21:50:00 -0500
-Subject: [PATCH 075/213] bcachefs: Fix shutdown message
+Subject: [PATCH 075/233] bcachefs: Fix shutdown message
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0076-bcachefs-delete-dead-code.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0076-bcachefs-delete-dead-code.patch
index 87538d8..ccfa195 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0076-bcachefs-delete-dead-code.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0076-bcachefs-delete-dead-code.patch
@@ -1,7 +1,7 @@
 From 2228901e43af2add536866df466a21117faef0b0 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 12 Nov 2024 03:53:30 -0500
-Subject: [PATCH 076/213] bcachefs: delete dead code
+Subject: [PATCH 076/233] bcachefs: delete dead code
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0077-bcachefs-bch2_btree_bit_mod_iter.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0077-bcachefs-bch2_btree_bit_mod_iter.patch
index 683db59..caa5550 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0077-bcachefs-bch2_btree_bit_mod_iter.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0077-bcachefs-bch2_btree_bit_mod_iter.patch
@@ -1,7 +1,7 @@
 From 7fda5f15087a016cc2ef2d449bcba4e4b9b795ce Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 26 Oct 2024 23:35:03 -0400
-Subject: [PATCH 077/213] bcachefs: bch2_btree_bit_mod_iter()
+Subject: [PATCH 077/233] bcachefs: bch2_btree_bit_mod_iter()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0078-bcachefs-Delete-dead-code-from-bch2_discard_one_buck.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0078-bcachefs-Delete-dead-code-from-bch2_discard_one_buck.patch
index 8390672..1ff2605 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0078-bcachefs-Delete-dead-code-from-bch2_discard_one_buck.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0078-bcachefs-Delete-dead-code-from-bch2_discard_one_buck.patch
@@ -1,7 +1,7 @@
 From 7ad0ba0e1849e010a7be3e90f6588b4460a469e4 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 26 Oct 2024 22:52:06 -0400
-Subject: [PATCH 078/213] bcachefs: Delete dead code from
+Subject: [PATCH 078/233] bcachefs: Delete dead code from
  bch2_discard_one_bucket()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0079-bcachefs-lru-errors-are-expected-when-reconstructing.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0079-bcachefs-lru-errors-are-expected-when-reconstructing.patch
index 4d98fa4..305a43d 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0079-bcachefs-lru-errors-are-expected-when-reconstructing.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0079-bcachefs-lru-errors-are-expected-when-reconstructing.patch
@@ -1,7 +1,7 @@
 From d6ad842cf77fe209875d699d3b2d64b764d5edd2 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 29 Oct 2024 01:17:08 -0400
-Subject: [PATCH 079/213] bcachefs: lru errors are expected when reconstructing
+Subject: [PATCH 079/233] bcachefs: lru errors are expected when reconstructing
  alloc
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0080-bcachefs-Kill-FSCK_NEED_FSCK.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0080-bcachefs-Kill-FSCK_NEED_FSCK.patch
index de33f2a..d9e8a04 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0080-bcachefs-Kill-FSCK_NEED_FSCK.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0080-bcachefs-Kill-FSCK_NEED_FSCK.patch
@@ -1,7 +1,7 @@
 From 4a370320dcb4ea925e38a852baf85724baf9711a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 28 Oct 2024 21:27:23 -0400
-Subject: [PATCH 080/213] bcachefs: Kill FSCK_NEED_FSCK
+Subject: [PATCH 080/233] bcachefs: Kill FSCK_NEED_FSCK
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0081-bcachefs-Reserve-8-bits-in-bch_reflink_p.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0081-bcachefs-Reserve-8-bits-in-bch_reflink_p.patch
index ae7450d..0e592c3 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0081-bcachefs-Reserve-8-bits-in-bch_reflink_p.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0081-bcachefs-Reserve-8-bits-in-bch_reflink_p.patch
@@ -1,7 +1,7 @@
 From b36ff5dc0842ed3c4aa202107da727cc74b59cd0 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 28 Oct 2024 23:43:16 -0400
-Subject: [PATCH 081/213] bcachefs: Reserve 8 bits in bch_reflink_p
+Subject: [PATCH 081/233] bcachefs: Reserve 8 bits in bch_reflink_p
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0082-bcachefs-Reorganize-reflink.c-a-bit.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0082-bcachefs-Reorganize-reflink.c-a-bit.patch
index 097a226..32af3a9 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0082-bcachefs-Reorganize-reflink.c-a-bit.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0082-bcachefs-Reorganize-reflink.c-a-bit.patch
@@ -1,7 +1,7 @@
 From 6cf666ffb5694d38860eb3f46d773825487e7f7e Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 31 Oct 2024 01:25:09 -0400
-Subject: [PATCH 082/213] bcachefs: Reorganize reflink.c a bit
+Subject: [PATCH 082/233] bcachefs: Reorganize reflink.c a bit
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0083-bcachefs-Don-t-delete-reflink-pointers-to-missing-in.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0083-bcachefs-Don-t-delete-reflink-pointers-to-missing-in.patch
index e5a6248..c2251b7 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0083-bcachefs-Don-t-delete-reflink-pointers-to-missing-in.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0083-bcachefs-Don-t-delete-reflink-pointers-to-missing-in.patch
@@ -1,7 +1,7 @@
 From df4270ccd3907ff2fc8ba3cba6328a229a5bd203 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 20:27:44 -0400
-Subject: [PATCH 083/213] bcachefs: Don't delete reflink pointers to missing
+Subject: [PATCH 083/233] bcachefs: Don't delete reflink pointers to missing
  indirect extents
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0084-bcachefs-kill-inconsistent-err-in-invalidate_one_buc.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0084-bcachefs-kill-inconsistent-err-in-invalidate_one_buc.patch
index e1d035b..246be27 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0084-bcachefs-kill-inconsistent-err-in-invalidate_one_buc.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0084-bcachefs-kill-inconsistent-err-in-invalidate_one_buc.patch
@@ -1,7 +1,7 @@
 From 3de116ce179b69eb2d92498a0872e5ab786cf4ef Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 27 Oct 2024 00:05:54 -0400
-Subject: [PATCH 084/213] bcachefs: kill inconsistent err in
+Subject: [PATCH 084/233] bcachefs: kill inconsistent err in
  invalidate_one_bucket()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0085-bcachefs-rework-bch2_bucket_alloc_freelist-freelist-.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0085-bcachefs-rework-bch2_bucket_alloc_freelist-freelist-.patch
index 20c2dbe..bd806bf 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0085-bcachefs-rework-bch2_bucket_alloc_freelist-freelist-.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0085-bcachefs-rework-bch2_bucket_alloc_freelist-freelist-.patch
@@ -1,7 +1,7 @@
 From ecadaf9ae3c9d091cd04c6998341db98bdf683ce Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 27 Oct 2024 20:47:03 -0400
-Subject: [PATCH 085/213] bcachefs: rework bch2_bucket_alloc_freelist()
+Subject: [PATCH 085/233] bcachefs: rework bch2_bucket_alloc_freelist()
  freelist iteration
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0086-bcachefs-try_alloc_bucket-now-uses-bch2_check_discar.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0086-bcachefs-try_alloc_bucket-now-uses-bch2_check_discar.patch
index 13ace93..048abb3 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0086-bcachefs-try_alloc_bucket-now-uses-bch2_check_discar.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0086-bcachefs-try_alloc_bucket-now-uses-bch2_check_discar.patch
@@ -1,7 +1,7 @@
 From c51b6019074d107e2c60b23dc23e5c7886a27a4e Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 27 Oct 2024 00:40:43 -0400
-Subject: [PATCH 086/213] bcachefs: try_alloc_bucket() now uses
+Subject: [PATCH 086/233] bcachefs: try_alloc_bucket() now uses
  bch2_check_discard_freespace_key()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0087-bcachefs-bch2_bucket_do_index-inconsistent_err-fsck_.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0087-bcachefs-bch2_bucket_do_index-inconsistent_err-fsck_.patch
index c43692d..080737c 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0087-bcachefs-bch2_bucket_do_index-inconsistent_err-fsck_.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0087-bcachefs-bch2_bucket_do_index-inconsistent_err-fsck_.patch
@@ -1,7 +1,7 @@
 From cbc079bcff7d5eb38f54f3e7d378100d919e028a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 26 Oct 2024 22:21:20 -0400
-Subject: [PATCH 087/213] bcachefs: bch2_bucket_do_index(): inconsistent_err ->
+Subject: [PATCH 087/233] bcachefs: bch2_bucket_do_index(): inconsistent_err ->
  fsck_err
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0088-bcachefs-discard_one_bucket-now-uses-need_discard_or.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0088-bcachefs-discard_one_bucket-now-uses-need_discard_or.patch
index 979bd65..c516f8d 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0088-bcachefs-discard_one_bucket-now-uses-need_discard_or.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0088-bcachefs-discard_one_bucket-now-uses-need_discard_or.patch
@@ -1,7 +1,7 @@
 From a7df326af032869e31b0d2a7e3c03190caf3e381 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 26 Oct 2024 23:25:17 -0400
-Subject: [PATCH 088/213] bcachefs: discard_one_bucket() now uses
+Subject: [PATCH 088/233] bcachefs: discard_one_bucket() now uses
  need_discard_or_freespace_err()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0089-bcachefs-Implement-bch2_btree_iter_prev_min.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0089-bcachefs-Implement-bch2_btree_iter_prev_min.patch
index 669f8b7..e8fe85c 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0089-bcachefs-Implement-bch2_btree_iter_prev_min.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0089-bcachefs-Implement-bch2_btree_iter_prev_min.patch
@@ -1,7 +1,7 @@
 From 632bcf38651efbbf9507cf35ae63d6ac291dca24 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 24 Oct 2024 22:12:37 -0400
-Subject: [PATCH 089/213] bcachefs: Implement bch2_btree_iter_prev_min()
+Subject: [PATCH 089/233] bcachefs: Implement bch2_btree_iter_prev_min()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0090-bcachefs-peek_prev_min-Search-forwards-for-extents-s.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0090-bcachefs-peek_prev_min-Search-forwards-for-extents-s.patch
index 9404338..6daa2c0 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0090-bcachefs-peek_prev_min-Search-forwards-for-extents-s.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0090-bcachefs-peek_prev_min-Search-forwards-for-extents-s.patch
@@ -1,7 +1,7 @@
 From 3140d0052a47723243dbd8f5a1f49ebb5eda2e9e Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 25 Oct 2024 20:41:06 -0400
-Subject: [PATCH 090/213] bcachefs: peek_prev_min(): Search forwards for
+Subject: [PATCH 090/233] bcachefs: peek_prev_min(): Search forwards for
  extents, snapshots
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0091-bcachefs-Delete-backpointers-check-in-try_alloc_buck.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0091-bcachefs-Delete-backpointers-check-in-try_alloc_buck.patch
index 50457ca..eb05c30 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0091-bcachefs-Delete-backpointers-check-in-try_alloc_buck.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0091-bcachefs-Delete-backpointers-check-in-try_alloc_buck.patch
@@ -1,7 +1,7 @@
 From 59fad23c7abcecc8d4022e76050295c2f37c1bfb Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 14 Nov 2024 21:28:40 -0500
-Subject: [PATCH 091/213] bcachefs: Delete backpointers check in
+Subject: [PATCH 091/233] bcachefs: Delete backpointers check in
  try_alloc_bucket()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0092-bcachefs-Kill-bch2_get_next_backpointer.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0092-bcachefs-Kill-bch2_get_next_backpointer.patch
index d9f6bd1..d63a340 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0092-bcachefs-Kill-bch2_get_next_backpointer.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0092-bcachefs-Kill-bch2_get_next_backpointer.patch
@@ -1,7 +1,7 @@
 From 7fdfb0cbea34b8dcc319be4b4898d89350a7f40f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 14 Nov 2024 21:53:38 -0500
-Subject: [PATCH 092/213] bcachefs: Kill bch2_get_next_backpointer()
+Subject: [PATCH 092/233] bcachefs: Kill bch2_get_next_backpointer()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0093-bcachefs-add-missing-BTREE_ITER_intent.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0093-bcachefs-add-missing-BTREE_ITER_intent.patch
index 0680b9c..87c2b02 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0093-bcachefs-add-missing-BTREE_ITER_intent.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0093-bcachefs-add-missing-BTREE_ITER_intent.patch
@@ -1,7 +1,7 @@
 From d5b149f3108a40e2bc88e8fcd9bc5d70096fa6c3 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 17 Nov 2024 03:31:01 -0500
-Subject: [PATCH 093/213] bcachefs: add missing BTREE_ITER_intent
+Subject: [PATCH 093/233] bcachefs: add missing BTREE_ITER_intent
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0094-bcachefs-compression-workspaces-should-be-indexed-by.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0094-bcachefs-compression-workspaces-should-be-indexed-by.patch
index 3e270ff..11fb8cd 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0094-bcachefs-compression-workspaces-should-be-indexed-by.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0094-bcachefs-compression-workspaces-should-be-indexed-by.patch
@@ -1,7 +1,7 @@
 From 3c0fc088af9edef54fb6fb410f928df0268a7f63 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 16 Nov 2024 21:03:53 -0500
-Subject: [PATCH 094/213] bcachefs: compression workspaces should be indexed by
+Subject: [PATCH 094/233] bcachefs: compression workspaces should be indexed by
  opt, not type
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0095-bcachefs-Don-t-use-a-shared-decompress-workspace-mem.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0095-bcachefs-Don-t-use-a-shared-decompress-workspace-mem.patch
index e087bb4..146a854 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0095-bcachefs-Don-t-use-a-shared-decompress-workspace-mem.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0095-bcachefs-Don-t-use-a-shared-decompress-workspace-mem.patch
@@ -1,7 +1,7 @@
 From 3a1897837a020cf57b2fa9ceb69f488762e89255 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 15 Nov 2024 00:52:20 -0500
-Subject: [PATCH 095/213] bcachefs: Don't use a shared decompress workspace
+Subject: [PATCH 095/233] bcachefs: Don't use a shared decompress workspace
  mempool
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0096-bcachefs-Don-t-BUG_ON-when-superblock-feature-wasn-t.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0096-bcachefs-Don-t-BUG_ON-when-superblock-feature-wasn-t.patch
index 1895124..b0eeac4 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0096-bcachefs-Don-t-BUG_ON-when-superblock-feature-wasn-t.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0096-bcachefs-Don-t-BUG_ON-when-superblock-feature-wasn-t.patch
@@ -1,7 +1,7 @@
 From b287adb628223810c78703e6bcad624944dde679 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 14 Nov 2024 23:03:40 -0500
-Subject: [PATCH 096/213] bcachefs: Don't BUG_ON() when superblock feature
+Subject: [PATCH 096/233] bcachefs: Don't BUG_ON() when superblock feature
  wasn't set for compressed data
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0097-bcachefs-kill-bch2_journal_entries_free.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0097-bcachefs-kill-bch2_journal_entries_free.patch
index c587acc..454f615 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0097-bcachefs-kill-bch2_journal_entries_free.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0097-bcachefs-kill-bch2_journal_entries_free.patch
@@ -1,7 +1,7 @@
 From ed144047ef65601342eb7a821a8648b19d6b44a9 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 16 Nov 2024 23:54:19 -0500
-Subject: [PATCH 097/213] bcachefs: kill bch2_journal_entries_free()
+Subject: [PATCH 097/233] bcachefs: kill bch2_journal_entries_free()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0098-bcachefs-journal-keys-sort-keys-for-interior-nodes-f.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0098-bcachefs-journal-keys-sort-keys-for-interior-nodes-f.patch
index 9e977cb..ec6372b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0098-bcachefs-journal-keys-sort-keys-for-interior-nodes-f.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0098-bcachefs-journal-keys-sort-keys-for-interior-nodes-f.patch
@@ -1,7 +1,7 @@
 From 1d1374a0837b8ba85c6ef9bf48efe52bf975cd51 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 17 Nov 2024 14:20:35 -0500
-Subject: [PATCH 098/213] bcachefs: journal keys: sort keys for interior nodes
+Subject: [PATCH 098/233] bcachefs: journal keys: sort keys for interior nodes
  first
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0099-bcachefs-btree_and_journal_iter-don-t-iterate-over-t.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0099-bcachefs-btree_and_journal_iter-don-t-iterate-over-t.patch
index ad4721d..d8f01a4 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0099-bcachefs-btree_and_journal_iter-don-t-iterate-over-t.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0099-bcachefs-btree_and_journal_iter-don-t-iterate-over-t.patch
@@ -1,7 +1,7 @@
 From 1a8f5adc2028bd7a11a96f85abae6a0e051c7ba4 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 17 Nov 2024 14:39:46 -0500
-Subject: [PATCH 099/213] bcachefs: btree_and_journal_iter: don't iterate over
+Subject: [PATCH 099/233] bcachefs: btree_and_journal_iter: don't iterate over
  too many whiteouts when prefetching
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0100-bcachefs-fix-O-n-2-issue-with-whiteouts-in-journal-k.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0100-bcachefs-fix-O-n-2-issue-with-whiteouts-in-journal-k.patch
index cc450c3..474d37e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0100-bcachefs-fix-O-n-2-issue-with-whiteouts-in-journal-k.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0100-bcachefs-fix-O-n-2-issue-with-whiteouts-in-journal-k.patch
@@ -1,7 +1,7 @@
 From 92084feca4fd9d534b7d1d9e1425faeeaf91c3fa Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 17 Nov 2024 02:23:24 -0500
-Subject: [PATCH 100/213] bcachefs: fix O(n^2) issue with whiteouts in journal
+Subject: [PATCH 100/233] bcachefs: fix O(n^2) issue with whiteouts in journal
  keys
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0101-bcachefs-Fix-evacuate_bucket-tracepoint.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0101-bcachefs-Fix-evacuate_bucket-tracepoint.patch
index 6de72bb..fda03a1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0101-bcachefs-Fix-evacuate_bucket-tracepoint.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0101-bcachefs-Fix-evacuate_bucket-tracepoint.patch
@@ -1,7 +1,7 @@
 From 16de1298962eb607d154962cbf2b6ce6bdbd5f8f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 9 Dec 2024 06:18:49 -0500
-Subject: [PATCH 101/213] bcachefs: Fix evacuate_bucket tracepoint
+Subject: [PATCH 101/233] bcachefs: Fix evacuate_bucket tracepoint
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0102-bcachefs-fix-bp_pos_to_bucket_nodev_noerror.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0102-bcachefs-fix-bp_pos_to_bucket_nodev_noerror.patch
index d348c13..6379ebd 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0102-bcachefs-fix-bp_pos_to_bucket_nodev_noerror.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0102-bcachefs-fix-bp_pos_to_bucket_nodev_noerror.patch
@@ -1,7 +1,7 @@
 From 62b185571a65ab3088546fbe1f40aeb085bc7267 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 14 Nov 2024 22:49:40 -0500
-Subject: [PATCH 102/213] bcachefs: fix bp_pos_to_bucket_nodev_noerror
+Subject: [PATCH 102/233] bcachefs: fix bp_pos_to_bucket_nodev_noerror
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0103-bcachefs-check-for-backpointers-to-invalid-device.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0103-bcachefs-check-for-backpointers-to-invalid-device.patch
index 366b4f4..782075d 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0103-bcachefs-check-for-backpointers-to-invalid-device.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0103-bcachefs-check-for-backpointers-to-invalid-device.patch
@@ -1,7 +1,7 @@
 From 3f2e467845296b24eb0e0d026e1f551ef73f0896 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 18 Nov 2024 00:16:52 -0500
-Subject: [PATCH 103/213] bcachefs: check for backpointers to invalid device
+Subject: [PATCH 103/233] bcachefs: check for backpointers to invalid device
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0104-bcachefs-bucket_pos_to_bp_end.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0104-bcachefs-bucket_pos_to_bp_end.patch
index 5fc02c2..9a9d587 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0104-bcachefs-bucket_pos_to_bp_end.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0104-bcachefs-bucket_pos_to_bp_end.patch
@@ -1,7 +1,7 @@
 From bbc2ccccfd24a9da72cdcd9b26568883250ff7a4 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 15 Nov 2024 16:30:30 -0500
-Subject: [PATCH 104/213] bcachefs: bucket_pos_to_bp_end()
+Subject: [PATCH 104/233] bcachefs: bucket_pos_to_bp_end()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0105-bcachefs-Drop-swab-code-for-backpointers-in-alloc-ke.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0105-bcachefs-Drop-swab-code-for-backpointers-in-alloc-ke.patch
index a992781..8b29587 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0105-bcachefs-Drop-swab-code-for-backpointers-in-alloc-ke.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0105-bcachefs-Drop-swab-code-for-backpointers-in-alloc-ke.patch
@@ -1,7 +1,7 @@
 From 165ca83f5581716dad0494addfffd2360fa52445 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 15 Nov 2024 17:45:44 -0500
-Subject: [PATCH 105/213] bcachefs: Drop swab code for backpointers in alloc
+Subject: [PATCH 105/233] bcachefs: Drop swab code for backpointers in alloc
  keys
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0106-bcachefs-bch_backpointer-bkey_i_backpointer.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0106-bcachefs-bch_backpointer-bkey_i_backpointer.patch
index 6cfece3..868dcb1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0106-bcachefs-bch_backpointer-bkey_i_backpointer.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0106-bcachefs-bch_backpointer-bkey_i_backpointer.patch
@@ -1,7 +1,7 @@
 From ad5834890f182b4f9ccf169c1b469dd0e9b9a135 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 15 Nov 2024 17:36:09 -0500
-Subject: [PATCH 106/213] bcachefs: bch_backpointer -> bkey_i_backpointer
+Subject: [PATCH 106/233] bcachefs: bch_backpointer -> bkey_i_backpointer
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0107-bcachefs-Fix-check_backpointers_to_extents-range-lim.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0107-bcachefs-Fix-check_backpointers_to_extents-range-lim.patch
index cafdacf..9e26b4a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0107-bcachefs-Fix-check_backpointers_to_extents-range-lim.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0107-bcachefs-Fix-check_backpointers_to_extents-range-lim.patch
@@ -1,7 +1,7 @@
 From 283dcbb80c18b9d9cc2f17dc81bfb2a049cbef0e Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 18 Nov 2024 00:32:57 -0500
-Subject: [PATCH 107/213] bcachefs: Fix check_backpointers_to_extents range
+Subject: [PATCH 107/233] bcachefs: Fix check_backpointers_to_extents range
  limiting
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0108-bcachefs-kill-bch_backpointer.bucket_offset-usage.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0108-bcachefs-kill-bch_backpointer.bucket_offset-usage.patch
index 4706a7f..256c14a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0108-bcachefs-kill-bch_backpointer.bucket_offset-usage.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0108-bcachefs-kill-bch_backpointer.bucket_offset-usage.patch
@@ -1,7 +1,7 @@
 From da89857b5fee06e4424cc235c2534edd4621dc6f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 17 Nov 2024 18:26:54 -0500
-Subject: [PATCH 108/213] bcachefs: kill bch_backpointer.bucket_offset usage
+Subject: [PATCH 108/233] bcachefs: kill bch_backpointer.bucket_offset usage
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0109-bcachefs-New-backpointers-helpers.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0109-bcachefs-New-backpointers-helpers.patch
index b09b675..bd3e10e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0109-bcachefs-New-backpointers-helpers.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0109-bcachefs-New-backpointers-helpers.patch
@@ -1,7 +1,7 @@
 From 1f3c4ab3fbb3400f5527087427c590632a4a75df Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 14 Nov 2024 21:34:43 -0500
-Subject: [PATCH 109/213] bcachefs: New backpointers helpers
+Subject: [PATCH 109/233] bcachefs: New backpointers helpers
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0110-bcachefs-Can-now-block-journal-activity-without-clos.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0110-bcachefs-Can-now-block-journal-activity-without-clos.patch
index 4d62354..887d2eb 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0110-bcachefs-Can-now-block-journal-activity-without-clos.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0110-bcachefs-Can-now-block-journal-activity-without-clos.patch
@@ -1,7 +1,7 @@
 From 01d8d04564c46cfafc454511601610af2fb4a8fb Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 23 Nov 2024 16:27:47 -0500
-Subject: [PATCH 110/213] bcachefs: Can now block journal activity without
+Subject: [PATCH 110/233] bcachefs: Can now block journal activity without
  closing cur entry
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0111-bcachefs-trivial-btree-write-buffer-refactoring.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0111-bcachefs-trivial-btree-write-buffer-refactoring.patch
index 97cdebb..f74c7da 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0111-bcachefs-trivial-btree-write-buffer-refactoring.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0111-bcachefs-trivial-btree-write-buffer-refactoring.patch
@@ -1,7 +1,7 @@
 From 709336f96d44a887179a4ae58d86bdd01640eb3c Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 23 Nov 2024 18:21:12 -0500
-Subject: [PATCH 111/213] bcachefs: trivial btree write buffer refactoring
+Subject: [PATCH 111/233] bcachefs: trivial btree write buffer refactoring
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0112-bcachefs-Bias-reads-more-in-favor-of-faster-device.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0112-bcachefs-Bias-reads-more-in-favor-of-faster-device.patch
index 28cb1f2..a4eeab4 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0112-bcachefs-Bias-reads-more-in-favor-of-faster-device.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0112-bcachefs-Bias-reads-more-in-favor-of-faster-device.patch
@@ -1,7 +1,7 @@
 From 2c9a60bc315537ac764ee026635daf588c1beb9b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 23 Nov 2024 16:47:10 -0500
-Subject: [PATCH 112/213] bcachefs: Bias reads more in favor of faster device
+Subject: [PATCH 112/233] bcachefs: Bias reads more in favor of faster device
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0113-bcachefs-discard-fastpath-now-uses-bch2_discard_one_.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0113-bcachefs-discard-fastpath-now-uses-bch2_discard_one_.patch
index a8435e9..3406089 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0113-bcachefs-discard-fastpath-now-uses-bch2_discard_one_.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0113-bcachefs-discard-fastpath-now-uses-bch2_discard_one_.patch
@@ -1,7 +1,7 @@
 From 4e378cabba8d65835f76a60f05ddc2b44ce44f45 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 21 Nov 2024 20:09:45 -0500
-Subject: [PATCH 113/213] bcachefs: discard fastpath now uses
+Subject: [PATCH 113/233] bcachefs: discard fastpath now uses
  bch2_discard_one_bucket()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0114-bcachefs-btree_write_buffer_flush_seq-no-longer-clos.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0114-bcachefs-btree_write_buffer_flush_seq-no-longer-clos.patch
index 5e502b2..a2fbdc6 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0114-bcachefs-btree_write_buffer_flush_seq-no-longer-clos.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0114-bcachefs-btree_write_buffer_flush_seq-no-longer-clos.patch
@@ -1,7 +1,7 @@
 From 0e796cf8047d1e35c77573a8ef62f13e6d242b76 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 23 Apr 2024 02:18:18 -0400
-Subject: [PATCH 114/213] bcachefs: btree_write_buffer_flush_seq() no longer
+Subject: [PATCH 114/233] bcachefs: btree_write_buffer_flush_seq() no longer
  closes journal
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0115-bcachefs-BCH_ERR_btree_node_read_error_cached.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0115-bcachefs-BCH_ERR_btree_node_read_error_cached.patch
index e112e36..3d147ae 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0115-bcachefs-BCH_ERR_btree_node_read_error_cached.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0115-bcachefs-BCH_ERR_btree_node_read_error_cached.patch
@@ -1,7 +1,7 @@
 From 2ae6c5e05ddc1693a90fdad3e3443aed353a0b38 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 23 Nov 2024 22:12:58 -0500
-Subject: [PATCH 115/213] bcachefs: BCH_ERR_btree_node_read_error_cached
+Subject: [PATCH 115/233] bcachefs: BCH_ERR_btree_node_read_error_cached
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0116-bcachefs-Use-separate-rhltable-for-bch2_inode_or_des.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0116-bcachefs-Use-separate-rhltable-for-bch2_inode_or_des.patch
index f87bbbb..e79796e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0116-bcachefs-Use-separate-rhltable-for-bch2_inode_or_des.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0116-bcachefs-Use-separate-rhltable-for-bch2_inode_or_des.patch
@@ -1,7 +1,7 @@
 From 3ed349d91ec1912da074e1e4acf2af7892b659c7 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 20:15:30 -0500
-Subject: [PATCH 116/213] bcachefs: Use separate rhltable for
+Subject: [PATCH 116/233] bcachefs: Use separate rhltable for
  bch2_inode_or_descendents_is_open()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0117-bcachefs-errcode-cleanup-journal-errors.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0117-bcachefs-errcode-cleanup-journal-errors.patch
index b83ee0f..4df9fd9 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0117-bcachefs-errcode-cleanup-journal-errors.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0117-bcachefs-errcode-cleanup-journal-errors.patch
@@ -1,7 +1,7 @@
 From f3542deaa920f10ee70f33bbf435c84e37a33a65 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 21:49:08 -0500
-Subject: [PATCH 117/213] bcachefs: errcode cleanup: journal errors
+Subject: [PATCH 117/233] bcachefs: errcode cleanup: journal errors
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0118-bcachefs-disk_accounting-bch2_dev_rcu-bch2_dev_rcu_n.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0118-bcachefs-disk_accounting-bch2_dev_rcu-bch2_dev_rcu_n.patch
index dd3f730..a6f745f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0118-bcachefs-disk_accounting-bch2_dev_rcu-bch2_dev_rcu_n.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0118-bcachefs-disk_accounting-bch2_dev_rcu-bch2_dev_rcu_n.patch
@@ -1,7 +1,7 @@
 From 8b5373916097e3993c6539930f4181ca05b29e20 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 22:23:41 -0500
-Subject: [PATCH 118/213] bcachefs: disk_accounting: bch2_dev_rcu ->
+Subject: [PATCH 118/233] bcachefs: disk_accounting: bch2_dev_rcu ->
  bch2_dev_rcu_noerror
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0119-bcachefs-Fix-accounting_read-when-we-rewind.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0119-bcachefs-Fix-accounting_read-when-we-rewind.patch
index 69061bf..33f53e1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0119-bcachefs-Fix-accounting_read-when-we-rewind.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0119-bcachefs-Fix-accounting_read-when-we-rewind.patch
@@ -1,7 +1,7 @@
 From ba91f39cd42bcfac86b9a7165d56b6964c314c81 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 22:28:41 -0500
-Subject: [PATCH 119/213] bcachefs: Fix accounting_read when we rewind
+Subject: [PATCH 119/233] bcachefs: Fix accounting_read when we rewind
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0120-bcachefs-backpointer_to_missing_ptr-is-now-autofix.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0120-bcachefs-backpointer_to_missing_ptr-is-now-autofix.patch
index f49bbf0..1bfed09 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0120-bcachefs-backpointer_to_missing_ptr-is-now-autofix.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0120-bcachefs-backpointer_to_missing_ptr-is-now-autofix.patch
@@ -1,7 +1,7 @@
 From 658ca218178763396a5647ea63cf3e2f1a669e4d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 22:45:25 -0500
-Subject: [PATCH 120/213] bcachefs: backpointer_to_missing_ptr is now autofix
+Subject: [PATCH 120/233] bcachefs: backpointer_to_missing_ptr is now autofix
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0121-bcachefs-Fix-btree-node-scan-when-unknown-btree-IDs-.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0121-bcachefs-Fix-btree-node-scan-when-unknown-btree-IDs-.patch
index df54365..6595156 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0121-bcachefs-Fix-btree-node-scan-when-unknown-btree-IDs-.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0121-bcachefs-Fix-btree-node-scan-when-unknown-btree-IDs-.patch
@@ -1,7 +1,7 @@
 From 3307caf863385f8b670a6b496083571a88d3c0bc Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 22:57:01 -0500
-Subject: [PATCH 121/213] bcachefs: Fix btree node scan when unknown btree IDs
+Subject: [PATCH 121/233] bcachefs: Fix btree node scan when unknown btree IDs
  are present
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0122-bcachefs-Kill-bch2_bucket_alloc_new_fs.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0122-bcachefs-Kill-bch2_bucket_alloc_new_fs.patch
index 05b6e67..d16e917 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0122-bcachefs-Kill-bch2_bucket_alloc_new_fs.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0122-bcachefs-Kill-bch2_bucket_alloc_new_fs.patch
@@ -1,7 +1,7 @@
 From 873a885d1af707d5a44eec5439e49fe4ff4a3b02 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 23:28:21 -0500
-Subject: [PATCH 122/213] bcachefs: Kill bch2_bucket_alloc_new_fs()
+Subject: [PATCH 122/233] bcachefs: Kill bch2_bucket_alloc_new_fs()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0123-bcachefs-Bad-btree-roots-are-now-autofix.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0123-bcachefs-Bad-btree-roots-are-now-autofix.patch
index 884a0cb..354c932 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0123-bcachefs-Bad-btree-roots-are-now-autofix.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0123-bcachefs-Bad-btree-roots-are-now-autofix.patch
@@ -1,7 +1,7 @@
 From 46522a75a47ed8db6da54f37c4dcf934e12fe540 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 25 Nov 2024 00:21:27 -0500
-Subject: [PATCH 123/213] bcachefs: Bad btree roots are now autofix
+Subject: [PATCH 123/233] bcachefs: Bad btree roots are now autofix
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0124-bcachefs-Fix-dup-misordered-check-in-btree-node-read.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0124-bcachefs-Fix-dup-misordered-check-in-btree-node-read.patch
index 3c302a4..2d9b4d1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0124-bcachefs-Fix-dup-misordered-check-in-btree-node-read.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0124-bcachefs-Fix-dup-misordered-check-in-btree-node-read.patch
@@ -1,7 +1,7 @@
 From 2d66d3160dd7ee36bb8a42111516373ec1cc4d25 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 25 Nov 2024 01:26:56 -0500
-Subject: [PATCH 124/213] bcachefs: Fix dup/misordered check in btree node read
+Subject: [PATCH 124/233] bcachefs: Fix dup/misordered check in btree node read
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0125-bcachefs-Don-t-try-to-en-decrypt-when-encryption-not.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0125-bcachefs-Don-t-try-to-en-decrypt-when-encryption-not.patch
index 3afae84..e2c599d 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0125-bcachefs-Don-t-try-to-en-decrypt-when-encryption-not.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0125-bcachefs-Don-t-try-to-en-decrypt-when-encryption-not.patch
@@ -1,7 +1,7 @@
 From ec3ca7c9e05b1253ccce6a20ca1269750a71bd2a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 25 Nov 2024 02:05:02 -0500
-Subject: [PATCH 125/213] bcachefs: Don't try to en/decrypt when encryption not
+Subject: [PATCH 125/233] bcachefs: Don't try to en/decrypt when encryption not
  available
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0126-bcachefs-Change-disk-accounting-version-0-check-to-c.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0126-bcachefs-Change-disk-accounting-version-0-check-to-c.patch
index 76abae4..a5311ec 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0126-bcachefs-Change-disk-accounting-version-0-check-to-c.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0126-bcachefs-Change-disk-accounting-version-0-check-to-c.patch
@@ -1,7 +1,7 @@
 From 72177d492d17031c6cbbb7f6802a23cbdabd37ad Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 25 Nov 2024 17:03:13 -0500
-Subject: [PATCH 126/213] bcachefs: Change "disk accounting version 0" check to
+Subject: [PATCH 126/233] bcachefs: Change "disk accounting version 0" check to
  commit only
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0127-bcachefs-Fix-bch2_btree_node_update_key_early.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0127-bcachefs-Fix-bch2_btree_node_update_key_early.patch
index d129226..39a88de 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0127-bcachefs-Fix-bch2_btree_node_update_key_early.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0127-bcachefs-Fix-bch2_btree_node_update_key_early.patch
@@ -1,7 +1,7 @@
 From d6dd534eb3db761193e9913d669357a177c2b659 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 26 Nov 2024 15:16:57 -0500
-Subject: [PATCH 127/213] bcachefs: Fix bch2_btree_node_update_key_early()
+Subject: [PATCH 127/233] bcachefs: Fix bch2_btree_node_update_key_early()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0128-bcachefs-Go-RW-earlier-for-normal-rw-mount.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0128-bcachefs-Go-RW-earlier-for-normal-rw-mount.patch
index 1b20828..6beab6e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0128-bcachefs-Go-RW-earlier-for-normal-rw-mount.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0128-bcachefs-Go-RW-earlier-for-normal-rw-mount.patch
@@ -1,7 +1,7 @@
 From 839c29d574315fe2f3c3f707f248d75348cf769d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 26 Nov 2024 21:27:16 -0500
-Subject: [PATCH 128/213] bcachefs: Go RW earlier, for normal rw mount
+Subject: [PATCH 128/233] bcachefs: Go RW earlier, for normal rw mount
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0129-bcachefs-Fix-null-ptr-deref-in-btree_path_lock_root.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0129-bcachefs-Fix-null-ptr-deref-in-btree_path_lock_root.patch
index e26bc38..a7f3f00 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0129-bcachefs-Fix-null-ptr-deref-in-btree_path_lock_root.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0129-bcachefs-Fix-null-ptr-deref-in-btree_path_lock_root.patch
@@ -1,7 +1,7 @@
 From 33213a5be19ee403b58d57f4f311bd65ee261e3a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 26 Nov 2024 22:59:27 -0500
-Subject: [PATCH 129/213] bcachefs: Fix null ptr deref in
+Subject: [PATCH 129/233] bcachefs: Fix null ptr deref in
  btree_path_lock_root()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0130-bcachefs-Ignore-empty-btree-root-journal-entries.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0130-bcachefs-Ignore-empty-btree-root-journal-entries.patch
index ef027f5..07b3752 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0130-bcachefs-Ignore-empty-btree-root-journal-entries.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0130-bcachefs-Ignore-empty-btree-root-journal-entries.patch
@@ -1,7 +1,7 @@
 From aa492d53186526b0879bdcd62079c555d611e7a0 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 27 Nov 2024 01:03:41 -0500
-Subject: [PATCH 130/213] bcachefs: Ignore empty btree root journal entries
+Subject: [PATCH 130/233] bcachefs: Ignore empty btree root journal entries
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0131-bcachefs-struct-bkey_validate_context.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0131-bcachefs-struct-bkey_validate_context.patch
index 4c09b49..72f6864 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0131-bcachefs-struct-bkey_validate_context.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0131-bcachefs-struct-bkey_validate_context.patch
@@ -1,7 +1,7 @@
 From 4d13c89412e72913f81b03b655e0f03ab0c8605d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 27 Nov 2024 00:29:52 -0500
-Subject: [PATCH 131/213] bcachefs: struct bkey_validate_context
+Subject: [PATCH 131/233] bcachefs: struct bkey_validate_context
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0132-bcachefs-Make-topology-errors-autofix.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0132-bcachefs-Make-topology-errors-autofix.patch
index e0a762a..6b08b87 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0132-bcachefs-Make-topology-errors-autofix.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0132-bcachefs-Make-topology-errors-autofix.patch
@@ -1,7 +1,7 @@
 From 502a010a6c8b57555514ff5518adbe6ee5fe6ace Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 24 Nov 2024 21:28:07 -0500
-Subject: [PATCH 132/213] bcachefs: Make topology errors autofix
+Subject: [PATCH 132/233] bcachefs: Make topology errors autofix
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0133-bcachefs-BCH_FS_recovery_running.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0133-bcachefs-BCH_FS_recovery_running.patch
index a29fa94..87e3c40 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0133-bcachefs-BCH_FS_recovery_running.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0133-bcachefs-BCH_FS_recovery_running.patch
@@ -1,7 +1,7 @@
 From 8afb03592ffda8f215e4b6816f847a32ad2ac53d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 27 Nov 2024 03:00:54 -0500
-Subject: [PATCH 133/213] bcachefs: BCH_FS_recovery_running
+Subject: [PATCH 133/233] bcachefs: BCH_FS_recovery_running
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0134-bcachefs-Guard-against-journal-seq-overflow.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0134-bcachefs-Guard-against-journal-seq-overflow.patch
index 0db0d89..4944d8d 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0134-bcachefs-Guard-against-journal-seq-overflow.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0134-bcachefs-Guard-against-journal-seq-overflow.patch
@@ -1,7 +1,7 @@
 From a5d7cf346646cb3d58221d896ed65224a306bf8f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 27 Nov 2024 21:58:43 -0500
-Subject: [PATCH 134/213] bcachefs: Guard against journal seq overflow
+Subject: [PATCH 134/233] bcachefs: Guard against journal seq overflow
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0135-bcachefs-Issue-a-transaction-restart-after-commit-in.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0135-bcachefs-Issue-a-transaction-restart-after-commit-in.patch
index 5102b77..0d85d7b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0135-bcachefs-Issue-a-transaction-restart-after-commit-in.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0135-bcachefs-Issue-a-transaction-restart-after-commit-in.patch
@@ -1,7 +1,7 @@
 From 6248d420a98583d960b736bec0fc52d1a4134894 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 27 Nov 2024 22:09:29 -0500
-Subject: [PATCH 135/213] bcachefs: Issue a transaction restart after commit in
+Subject: [PATCH 135/233] bcachefs: Issue a transaction restart after commit in
  repair
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0136-bcachefs-Guard-against-backpointers-to-unknown-btree.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0136-bcachefs-Guard-against-backpointers-to-unknown-btree.patch
index 32b8f1c..981a899 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0136-bcachefs-Guard-against-backpointers-to-unknown-btree.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0136-bcachefs-Guard-against-backpointers-to-unknown-btree.patch
@@ -1,7 +1,7 @@
 From fbb140ee4560aaf301b11de4e22cf7821ee8ab0b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 27 Nov 2024 22:29:54 -0500
-Subject: [PATCH 136/213] bcachefs: Guard against backpointers to unknown
+Subject: [PATCH 136/233] bcachefs: Guard against backpointers to unknown
  btrees
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0137-bcachefs-Fix-journal_iter-list-corruption.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0137-bcachefs-Fix-journal_iter-list-corruption.patch
index 95fdde4..c5faaf2 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0137-bcachefs-Fix-journal_iter-list-corruption.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0137-bcachefs-Fix-journal_iter-list-corruption.patch
@@ -1,7 +1,7 @@
 From 5a1b4c8d17569dd893b47115fb744bb860031a28 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 15:10:24 -0500
-Subject: [PATCH 137/213] bcachefs: Fix journal_iter list corruption
+Subject: [PATCH 137/233] bcachefs: Fix journal_iter list corruption
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0138-bcachefs-add-missing-printbuf_reset.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0138-bcachefs-add-missing-printbuf_reset.patch
index 68b940e..e6d7e9e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0138-bcachefs-add-missing-printbuf_reset.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0138-bcachefs-add-missing-printbuf_reset.patch
@@ -1,7 +1,7 @@
 From 1a7e03622b24f52ac9991bf5eb9b5345776d1fb2 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 16:09:04 -0500
-Subject: [PATCH 138/213] bcachefs: add missing printbuf_reset()
+Subject: [PATCH 138/233] bcachefs: add missing printbuf_reset()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0139-bcachefs-mark-more-errors-AUTOFIX.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0139-bcachefs-mark-more-errors-AUTOFIX.patch
index 657671a..45afceb 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0139-bcachefs-mark-more-errors-AUTOFIX.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0139-bcachefs-mark-more-errors-AUTOFIX.patch
@@ -1,7 +1,7 @@
 From b7b7f5ab552920578736a6a25cb370df0096d1df Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 16:09:15 -0500
-Subject: [PATCH 139/213] bcachefs: mark more errors AUTOFIX
+Subject: [PATCH 139/233] bcachefs: mark more errors AUTOFIX
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0140-bcachefs-Don-t-error-out-when-logging-fsck-error.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0140-bcachefs-Don-t-error-out-when-logging-fsck-error.patch
index b0c5f8e..5a62ee0 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0140-bcachefs-Don-t-error-out-when-logging-fsck-error.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0140-bcachefs-Don-t-error-out-when-logging-fsck-error.patch
@@ -1,7 +1,7 @@
 From ca04ac9a4aeaf4a70f9670befc2056fd85c517bb Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 16:14:06 -0500
-Subject: [PATCH 140/213] bcachefs: Don't error out when logging fsck error
+Subject: [PATCH 140/233] bcachefs: Don't error out when logging fsck error
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0141-bcachefs-do_fsck_ask_yn.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0141-bcachefs-do_fsck_ask_yn.patch
index 64f2bcc..4e84dd3 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0141-bcachefs-do_fsck_ask_yn.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0141-bcachefs-do_fsck_ask_yn.patch
@@ -1,7 +1,7 @@
 From 422310542e0699139ceba54439ed022097b55ebd Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 16:25:41 -0500
-Subject: [PATCH 141/213] bcachefs: do_fsck_ask_yn()
+Subject: [PATCH 141/233] bcachefs: do_fsck_ask_yn()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0142-bcachefs-Check-for-bucket-journal-seq-in-the-future.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0142-bcachefs-Check-for-bucket-journal-seq-in-the-future.patch
index 09187a5..8b020e2 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0142-bcachefs-Check-for-bucket-journal-seq-in-the-future.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0142-bcachefs-Check-for-bucket-journal-seq-in-the-future.patch
@@ -1,7 +1,7 @@
 From 6efc86ff29d2010ce9ffe0d8121ab64c89832a4f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 16:59:40 -0500
-Subject: [PATCH 142/213] bcachefs: Check for bucket journal seq in the future
+Subject: [PATCH 142/233] bcachefs: Check for bucket journal seq in the future
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0143-bcachefs-Check-for-inode-journal-seq-in-the-future.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0143-bcachefs-Check-for-inode-journal-seq-in-the-future.patch
index a718722..42c7e28 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0143-bcachefs-Check-for-inode-journal-seq-in-the-future.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0143-bcachefs-Check-for-inode-journal-seq-in-the-future.patch
@@ -1,7 +1,7 @@
 From 9d59eb0be24ff7e84dfd8bc80f2da35e819decfe Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 17:48:20 -0500
-Subject: [PATCH 143/213] bcachefs: Check for inode journal seq in the future
+Subject: [PATCH 143/233] bcachefs: Check for inode journal seq in the future
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0144-bcachefs-cryptographic-MACs-on-superblock-are-not-ye.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0144-bcachefs-cryptographic-MACs-on-superblock-are-not-ye.patch
index ff07dbc..e28b41f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0144-bcachefs-cryptographic-MACs-on-superblock-are-not-ye.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0144-bcachefs-cryptographic-MACs-on-superblock-are-not-ye.patch
@@ -1,7 +1,7 @@
 From 1b1f8623fbdcc0fc2ea1c087e146f77e30e94b1b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 17:57:55 -0500
-Subject: [PATCH 144/213] bcachefs: cryptographic MACs on superblock are not
+Subject: [PATCH 144/233] bcachefs: cryptographic MACs on superblock are not
  (yet?) supported
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0145-bcachefs-bch2_trans_relock-is-trylock-for-lockdep.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0145-bcachefs-bch2_trans_relock-is-trylock-for-lockdep.patch
index 9bfc8d1..659f46b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0145-bcachefs-bch2_trans_relock-is-trylock-for-lockdep.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0145-bcachefs-bch2_trans_relock-is-trylock-for-lockdep.patch
@@ -1,7 +1,7 @@
 From 4271983e79a7da2a3eb02eeee4cdfe35d3c7bc99 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 18:05:06 -0500
-Subject: [PATCH 145/213] bcachefs: bch2_trans_relock() is trylock for lockdep
+Subject: [PATCH 145/233] bcachefs: bch2_trans_relock() is trylock for lockdep
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0146-bcachefs-Check-for-extent-crc-uncompressed-compresse.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0146-bcachefs-Check-for-extent-crc-uncompressed-compresse.patch
index 5856896..42ecfaf 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0146-bcachefs-Check-for-extent-crc-uncompressed-compresse.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0146-bcachefs-Check-for-extent-crc-uncompressed-compresse.patch
@@ -1,7 +1,7 @@
 From 12b2baa0b5cb956abfd3ef05a1cc6ed21b565006 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 19:02:18 -0500
-Subject: [PATCH 146/213] bcachefs: Check for extent crc
+Subject: [PATCH 146/233] bcachefs: Check for extent crc
  uncompressed/compressed size mismatch
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0147-bcachefs-Don-t-recurse-in-check_discard_freespace_ke.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0147-bcachefs-Don-t-recurse-in-check_discard_freespace_ke.patch
index c1ee28a..aff6a6f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0147-bcachefs-Don-t-recurse-in-check_discard_freespace_ke.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0147-bcachefs-Don-t-recurse-in-check_discard_freespace_ke.patch
@@ -1,7 +1,7 @@
 From 5bb89aa54d003da949edb90ce6e399e25d7ba2bf Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 28 Nov 2024 19:30:23 -0500
-Subject: [PATCH 147/213] bcachefs: Don't recurse in
+Subject: [PATCH 147/233] bcachefs: Don't recurse in
  check_discard_freespace_key
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0148-bcachefs-Add-missing-parameter-description-to-bch2_b.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0148-bcachefs-Add-missing-parameter-description-to-bch2_b.patch
index ce0836d..cc2fe5a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0148-bcachefs-Add-missing-parameter-description-to-bch2_b.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0148-bcachefs-Add-missing-parameter-description-to-bch2_b.patch
@@ -1,7 +1,7 @@
 From 9a956407c26a40a289626d58669c62bd3417e368 Mon Sep 17 00:00:00 2001
 From: Yang Li <yang.lee@linux.alibaba.com>
 Date: Fri, 29 Nov 2024 14:38:27 +0800
-Subject: [PATCH 148/213] bcachefs: Add missing parameter description to
+Subject: [PATCH 148/233] bcachefs: Add missing parameter description to
  bch2_bucket_alloc_trans()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0149-bcachefs-Fix-fsck.c-build-in-userspace.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0149-bcachefs-Fix-fsck.c-build-in-userspace.patch
index 9e7a935..8fc1e80 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0149-bcachefs-Fix-fsck.c-build-in-userspace.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0149-bcachefs-Fix-fsck.c-build-in-userspace.patch
@@ -1,7 +1,7 @@
 From 428a2c2d6b128c18f3dcd289f549bf510933679a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 29 Nov 2024 21:12:47 -0500
-Subject: [PATCH 149/213] bcachefs: Fix fsck.c build in userspace
+Subject: [PATCH 149/233] bcachefs: Fix fsck.c build in userspace
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0150-bcachefs-bch2_inum_to_path.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0150-bcachefs-bch2_inum_to_path.patch
index f4ef9bf..dc4f24a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0150-bcachefs-bch2_inum_to_path.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0150-bcachefs-bch2_inum_to_path.patch
@@ -1,7 +1,7 @@
 From 2ab8d3198995c8db970dd9b4716d5acba215d48b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 28 Sep 2024 15:40:49 -0400
-Subject: [PATCH 150/213] bcachefs: bch2_inum_to_path()
+Subject: [PATCH 150/233] bcachefs: bch2_inum_to_path()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0151-bcachefs-Convert-write-path-errors-to-inum_to_path.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0151-bcachefs-Convert-write-path-errors-to-inum_to_path.patch
index a23dd92..389ba11 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0151-bcachefs-Convert-write-path-errors-to-inum_to_path.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0151-bcachefs-Convert-write-path-errors-to-inum_to_path.patch
@@ -1,18 +1,18 @@
-From 7593feaaec7b7b24125cb322a6eda0e8554de843 Mon Sep 17 00:00:00 2001
+From 67434cd4b78571347f6e72f6e083a7ed2629ca1b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 13 Nov 2024 23:08:57 -0500
-Subject: [PATCH 151/213] bcachefs: Convert write path errors to inum_to_path()
+Subject: [PATCH 151/233] bcachefs: Convert write path errors to inum_to_path()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
 Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
 ---
- fs/bcachefs/io_write.c | 85 ++++++++++++++++++++++++++----------------
- 1 file changed, 52 insertions(+), 33 deletions(-)
+ fs/bcachefs/io_write.c | 91 +++++++++++++++++++++++++-----------------
+ 1 file changed, 55 insertions(+), 36 deletions(-)
 
 diff --git a/fs/bcachefs/io_write.c b/fs/bcachefs/io_write.c
-index f97ebb30f6c0..91be9e9abb71 100644
+index f97ebb30f6c0..bae045e76055 100644
 --- a/fs/bcachefs/io_write.c
 +++ b/fs/bcachefs/io_write.c
 @@ -396,6 +396,21 @@ static int bch2_write_index_default(struct bch_write_op *op)
@@ -95,9 +95,13 @@ index f97ebb30f6c0..91be9e9abb71 100644
  		}
  
  		if (ret) {
-@@ -1341,9 +1359,11 @@ static void bch2_nocow_write(struct bch_write_op *op)
+@@ -1340,17 +1358,19 @@ static void bch2_nocow_write(struct bch_write_op *op)
+ 	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
  		goto retry;
  
++	bch2_trans_put(trans);
++	darray_exit(&buckets);
++
  	if (ret) {
 -		bch_err_inum_offset_ratelimited(c,
 -			op->pos.inode, op->pos.offset << 9,
@@ -110,6 +114,13 @@ index f97ebb30f6c0..91be9e9abb71 100644
  		op->error = ret;
  		op->flags |= BCH_WRITE_SUBMITTED;
  	}
+ 
+-	bch2_trans_put(trans);
+-	darray_exit(&buckets);
+-
+ 	/* fallback to cow write path? */
+ 	if (!(op->flags & BCH_WRITE_SUBMITTED)) {
+ 		closure_sync(&op->cl);
 @@ -1463,14 +1483,14 @@ static void __bch2_write(struct bch_write_op *op)
  		if (ret <= 0) {
  			op->flags |= BCH_WRITE_SUBMITTED;
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0152-bcachefs-list_pop_entry.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0152-bcachefs-list_pop_entry.patch
index 457e7bc..0cacdc6 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0152-bcachefs-list_pop_entry.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0152-bcachefs-list_pop_entry.patch
@@ -1,7 +1,7 @@
-From f2ea81f5840177149748c318131e60aef8c98c4a Mon Sep 17 00:00:00 2001
+From 5e415199384c50c686f34275a94dd0f831ed480d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 29 Nov 2024 19:13:54 -0500
-Subject: [PATCH 152/213] bcachefs: list_pop_entry()
+Subject: [PATCH 152/233] bcachefs: list_pop_entry()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
@@ -32,7 +32,7 @@ index 7d6c33f04092..250e73897d95 100644
  			break;
  
 diff --git a/fs/bcachefs/io_write.c b/fs/bcachefs/io_write.c
-index 91be9e9abb71..20da357e389a 100644
+index bae045e76055..3e71860f66b9 100644
 --- a/fs/bcachefs/io_write.c
 +++ b/fs/bcachefs/io_write.c
 @@ -637,9 +637,7 @@ void bch2_write_point_do_index_updates(struct work_struct *work)
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0153-bcachefs-bkey_fsck_err-now-respects-errors_silent.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0153-bcachefs-bkey_fsck_err-now-respects-errors_silent.patch
index 29baa41..ddc2725 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0153-bcachefs-bkey_fsck_err-now-respects-errors_silent.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0153-bcachefs-bkey_fsck_err-now-respects-errors_silent.patch
@@ -1,7 +1,7 @@
-From c4ebad88cf95f1049a0cacee9d06e8155c77eabf Mon Sep 17 00:00:00 2001
+From 28d5570cd27b3ec683df66093c223751371c95a7 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 29 Nov 2024 18:20:42 -0500
-Subject: [PATCH 153/213] bcachefs: bkey_fsck_err now respects errors_silent
+Subject: [PATCH 153/233] bcachefs: bkey_fsck_err now respects errors_silent
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0154-bcachefs-If-we-did-repair-on-a-btree-node-make-sure-.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0154-bcachefs-If-we-did-repair-on-a-btree-node-make-sure-.patch
index 328cf70..ab3adef 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0154-bcachefs-If-we-did-repair-on-a-btree-node-make-sure-.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0154-bcachefs-If-we-did-repair-on-a-btree-node-make-sure-.patch
@@ -1,7 +1,7 @@
-From 08f516db34bba8114e0bfd5de8fcd6cfe174d37d Mon Sep 17 00:00:00 2001
+From 247a12f3a216cb2368d596a152f0c32c2cb9d9c7 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 29 Nov 2024 18:17:00 -0500
-Subject: [PATCH 154/213] bcachefs: If we did repair on a btree node, make sure
+Subject: [PATCH 154/233] bcachefs: If we did repair on a btree node, make sure
  we rewrite it
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0155-bcachefs-bch2_async_btree_node_rewrites_flush.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0155-bcachefs-bch2_async_btree_node_rewrites_flush.patch
index 77eefda..b8d9fdf 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0155-bcachefs-bch2_async_btree_node_rewrites_flush.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0155-bcachefs-bch2_async_btree_node_rewrites_flush.patch
@@ -1,7 +1,7 @@
-From 5b13ff7bc8fb922e05ebaf5d2bbe349b1711f5f4 Mon Sep 17 00:00:00 2001
+From 0b5819b73c40535daa75a83347e6aaf5ce32ea55 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 29 Nov 2024 18:53:26 -0500
-Subject: [PATCH 155/213] bcachefs: bch2_async_btree_node_rewrites_flush()
+Subject: [PATCH 155/233] bcachefs: bch2_async_btree_node_rewrites_flush()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0156-bcachefs-fix-bch2_journal_key_insert_take-seq.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0156-bcachefs-fix-bch2_journal_key_insert_take-seq.patch
index ea0b105..93fa0a0 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0156-bcachefs-fix-bch2_journal_key_insert_take-seq.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0156-bcachefs-fix-bch2_journal_key_insert_take-seq.patch
@@ -1,7 +1,7 @@
-From 31f218584813b0121d461e92f0ac49f6ff78a0a1 Mon Sep 17 00:00:00 2001
+From a5b377f77372811d1d080f97c5d9b05e8c887435 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 30 Nov 2024 23:27:45 -0500
-Subject: [PATCH 156/213] bcachefs: fix bch2_journal_key_insert_take() seq
+Subject: [PATCH 156/233] bcachefs: fix bch2_journal_key_insert_take() seq
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0157-bcachefs-Improve-unable-to-allocate-journal-write-me.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0157-bcachefs-Improve-unable-to-allocate-journal-write-me.patch
index 41b77e1..632b3a0 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0157-bcachefs-Improve-unable-to-allocate-journal-write-me.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0157-bcachefs-Improve-unable-to-allocate-journal-write-me.patch
@@ -1,7 +1,7 @@
-From c78ecd89876e031abd348b692b2b17f6d11a7bd0 Mon Sep 17 00:00:00 2001
+From 030d6ebb78879e795f75533755f2b7b656806165 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 1 Dec 2024 16:39:54 -0500
-Subject: [PATCH 157/213] bcachefs: Improve "unable to allocate journal write"
+Subject: [PATCH 157/233] bcachefs: Improve "unable to allocate journal write"
  message
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0158-bcachefs-Fix-allocating-too-big-journal-entry.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0158-bcachefs-Fix-allocating-too-big-journal-entry.patch
index fb63f01..6fea55d 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0158-bcachefs-Fix-allocating-too-big-journal-entry.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0158-bcachefs-Fix-allocating-too-big-journal-entry.patch
@@ -1,7 +1,7 @@
-From 098abd4f06643351781329fa23fb03dbf4940157 Mon Sep 17 00:00:00 2001
+From e37f4286d41e5e8ddddd1b0716a08c0395deaf4a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 2 Dec 2024 23:36:38 -0500
-Subject: [PATCH 158/213] bcachefs: Fix allocating too big journal entry
+Subject: [PATCH 158/233] bcachefs: Fix allocating too big journal entry
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0159-bcachefs-BCACHEFS_PATH_TRACEPOINTS-should-depend-on-.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0159-bcachefs-BCACHEFS_PATH_TRACEPOINTS-should-depend-on-.patch
index b6987e9..1806612 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0159-bcachefs-BCACHEFS_PATH_TRACEPOINTS-should-depend-on-.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0159-bcachefs-BCACHEFS_PATH_TRACEPOINTS-should-depend-on-.patch
@@ -1,7 +1,7 @@
-From 8b3934b12e73e26ce8f44810b3664547106a3f26 Mon Sep 17 00:00:00 2001
+From 8a2713582e65edd634af55042a1580d3065e1ae9 Mon Sep 17 00:00:00 2001
 From: Geert Uytterhoeven <geert@linux-m68k.org>
 Date: Tue, 3 Dec 2024 17:40:10 +0100
-Subject: [PATCH 159/213] bcachefs: BCACHEFS_PATH_TRACEPOINTS should depend on
+Subject: [PATCH 159/233] bcachefs: BCACHEFS_PATH_TRACEPOINTS should depend on
  TRACING
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0160-bcachefs-rcu_pending-now-works-in-userspace.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0160-bcachefs-rcu_pending-now-works-in-userspace.patch
index e01afce..bfc9279 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0160-bcachefs-rcu_pending-now-works-in-userspace.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0160-bcachefs-rcu_pending-now-works-in-userspace.patch
@@ -1,7 +1,7 @@
-From cac5281134ef7e06ba32a352e87b0a3c6df99c0c Mon Sep 17 00:00:00 2001
+From 354ae858ba2d7fa5f387dddcfe12cdf7810217a9 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 3 Dec 2024 21:22:26 -0500
-Subject: [PATCH 160/213] bcachefs: rcu_pending now works in userspace
+Subject: [PATCH 160/233] bcachefs: rcu_pending now works in userspace
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0161-bcachefs-logged-ops-only-use-inum-0-of-logged-ops-bt.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0161-bcachefs-logged-ops-only-use-inum-0-of-logged-ops-bt.patch
index 76ef315..f7213b6 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0161-bcachefs-logged-ops-only-use-inum-0-of-logged-ops-bt.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0161-bcachefs-logged-ops-only-use-inum-0-of-logged-ops-bt.patch
@@ -1,7 +1,7 @@
-From 6a1e075dbda6d8407d1ff68341b4c98196965c77 Mon Sep 17 00:00:00 2001
+From 3ac87fa03f2ff6527539a7ec7be84488813841da Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 1 Dec 2024 21:35:11 -0500
-Subject: [PATCH 161/213] bcachefs: logged ops only use inum 0 of logged ops
+Subject: [PATCH 161/233] bcachefs: logged ops only use inum 0 of logged ops
  btree
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0162-bcachefs-Simplify-disk-accounting-validate-late.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0162-bcachefs-Simplify-disk-accounting-validate-late.patch
index 90e35ca..5c29d60 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0162-bcachefs-Simplify-disk-accounting-validate-late.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0162-bcachefs-Simplify-disk-accounting-validate-late.patch
@@ -1,7 +1,7 @@
-From 425ec5c32c86b8bc993bb87aeaedd359549e31ad Mon Sep 17 00:00:00 2001
+From 52a0da6fcd27f7fd8ab591735479e135c3cda3af Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 3 Dec 2024 22:03:18 -0500
-Subject: [PATCH 162/213] bcachefs: Simplify disk accounting validate late
+Subject: [PATCH 162/233] bcachefs: Simplify disk accounting validate late
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0163-bcachefs-Advance-to-next-bp-on-BCH_ERR_backpointer_t.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0163-bcachefs-Advance-to-next-bp-on-BCH_ERR_backpointer_t.patch
index 775f241..df873ce 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0163-bcachefs-Advance-to-next-bp-on-BCH_ERR_backpointer_t.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0163-bcachefs-Advance-to-next-bp-on-BCH_ERR_backpointer_t.patch
@@ -1,7 +1,7 @@
-From 53f24366cd45d56fae473195b808ddbf77abfa37 Mon Sep 17 00:00:00 2001
+From fdfafffb03e233615fbe7ba3fab3d7b0bbe78bd9 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 01:19:28 -0500
-Subject: [PATCH 163/213] bcachefs: Advance to next bp on
+Subject: [PATCH 163/233] bcachefs: Advance to next bp on
  BCH_ERR_backpointer_to_overwritten_btree_node
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0164-bcachefs-trace_accounting_mem_insert.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0164-bcachefs-trace_accounting_mem_insert.patch
index 13e13ab..8acd14e 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0164-bcachefs-trace_accounting_mem_insert.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0164-bcachefs-trace_accounting_mem_insert.patch
@@ -1,7 +1,7 @@
-From bd491375440f9efd5fcab12bd7c8b6206462f7f4 Mon Sep 17 00:00:00 2001
+From 2a21c9dea9ea0babf4adcbab544204ae50ae8164 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 17:44:25 -0500
-Subject: [PATCH 164/213] bcachefs: trace_accounting_mem_insert
+Subject: [PATCH 164/233] bcachefs: trace_accounting_mem_insert
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0165-bcachefs-Silence-unable-to-allocate-journal-write-if.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0165-bcachefs-Silence-unable-to-allocate-journal-write-if.patch
index 2775fc7..56c99d6 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0165-bcachefs-Silence-unable-to-allocate-journal-write-if.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0165-bcachefs-Silence-unable-to-allocate-journal-write-if.patch
@@ -1,7 +1,7 @@
-From 9a4b782edc05ffba053431011c4ff9fe6343ca53 Mon Sep 17 00:00:00 2001
+From fe236881929435323d0f4f144e1c3807d443c60c Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 17:48:06 -0500
-Subject: [PATCH 165/213] bcachefs: Silence "unable to allocate journal write"
+Subject: [PATCH 165/233] bcachefs: Silence "unable to allocate journal write"
  if we're already RO
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0166-bcachefs-BCH_ERR_insufficient_journal_devices.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0166-bcachefs-BCH_ERR_insufficient_journal_devices.patch
index 883259e..c1f8aa3 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0166-bcachefs-BCH_ERR_insufficient_journal_devices.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0166-bcachefs-BCH_ERR_insufficient_journal_devices.patch
@@ -1,7 +1,7 @@
-From 448210facffe56aba2ea878362cabfb8acf1a447 Mon Sep 17 00:00:00 2001
+From fd2a164b5c5fd7b690cc98c313d0f1512e0d2647 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 17:53:38 -0500
-Subject: [PATCH 166/213] bcachefs: BCH_ERR_insufficient_journal_devices
+Subject: [PATCH 166/233] bcachefs: BCH_ERR_insufficient_journal_devices
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0167-bcachefs-Fix-failure-to-allocate-journal-write-on-di.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0167-bcachefs-Fix-failure-to-allocate-journal-write-on-di.patch
index ccdb51b..8227229 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0167-bcachefs-Fix-failure-to-allocate-journal-write-on-di.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0167-bcachefs-Fix-failure-to-allocate-journal-write-on-di.patch
@@ -1,7 +1,7 @@
-From f15ffdaf4decbca235a8cbeee96b6a979ed4aa9d Mon Sep 17 00:00:00 2001
+From effc7a1c0683576324bc3ef92d83e51091a8bca6 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 18:16:25 -0500
-Subject: [PATCH 167/213] bcachefs: Fix failure to allocate journal write on
+Subject: [PATCH 167/233] bcachefs: Fix failure to allocate journal write on
  discard retry
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0168-bcachefs-dev_alloc_list.devs-dev_alloc_list.data.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0168-bcachefs-dev_alloc_list.devs-dev_alloc_list.data.patch
index 272aec1..a4f8c26 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0168-bcachefs-dev_alloc_list.devs-dev_alloc_list.data.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0168-bcachefs-dev_alloc_list.devs-dev_alloc_list.data.patch
@@ -1,7 +1,7 @@
-From 8e8985499ee4bc568a48426722d573698b45977a Mon Sep 17 00:00:00 2001
+From 0a1a0391c46b3128dc7f9b1b845bc98832f233a6 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 19:21:22 -0500
-Subject: [PATCH 168/213] bcachefs: dev_alloc_list.devs -> dev_alloc_list.data
+Subject: [PATCH 168/233] bcachefs: dev_alloc_list.devs -> dev_alloc_list.data
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0169-bcachefs-Journal-write-path-refactoring-debug-improv.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0169-bcachefs-Journal-write-path-refactoring-debug-improv.patch
index 38e4d4e..da9d01b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0169-bcachefs-Journal-write-path-refactoring-debug-improv.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0169-bcachefs-Journal-write-path-refactoring-debug-improv.patch
@@ -1,7 +1,7 @@
-From 87c98ce28f9cb79dbbdf9e0076599d01406263a4 Mon Sep 17 00:00:00 2001
+From 70feb569f2ce915068ac3d2050b843322cb5218c Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 18:14:14 -0500
-Subject: [PATCH 169/213] bcachefs: Journal write path refactoring, debug
+Subject: [PATCH 169/233] bcachefs: Journal write path refactoring, debug
  improvements
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0170-bcachefs-Call-bch2_btree_lost_data-on-btree-read-err.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0170-bcachefs-Call-bch2_btree_lost_data-on-btree-read-err.patch
index 70dab76..9bb03bc 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0170-bcachefs-Call-bch2_btree_lost_data-on-btree-read-err.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0170-bcachefs-Call-bch2_btree_lost_data-on-btree-read-err.patch
@@ -1,7 +1,7 @@
-From f0f95e6efb2d277b9f52ad960b3922d429807956 Mon Sep 17 00:00:00 2001
+From 8ea098f248cceb4838f41d7a01389eb26c8109e4 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 19:41:38 -0500
-Subject: [PATCH 170/213] bcachefs: Call bch2_btree_lost_data() on btree read
+Subject: [PATCH 170/233] bcachefs: Call bch2_btree_lost_data() on btree read
  error
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0171-bcachefs-Make-sure-__bch2_run_explicit_recovery_pass.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0171-bcachefs-Make-sure-__bch2_run_explicit_recovery_pass.patch
index 1975a9b..e1e34d1 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0171-bcachefs-Make-sure-__bch2_run_explicit_recovery_pass.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0171-bcachefs-Make-sure-__bch2_run_explicit_recovery_pass.patch
@@ -1,7 +1,7 @@
-From 09fde81c7d339f4860e6e077fc58e4bb40bfa8fc Mon Sep 17 00:00:00 2001
+From 61ab7cbbaae3ba7afa6e637dfd8a8207daf1c244 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 19:46:35 -0500
-Subject: [PATCH 171/213] bcachefs: Make sure
+Subject: [PATCH 171/233] bcachefs: Make sure
  __bch2_run_explicit_recovery_pass() signals to rewind
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0172-bcachefs-Don-t-call-bch2_btree_interior_update_will_.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0172-bcachefs-Don-t-call-bch2_btree_interior_update_will_.patch
index a909311..3159eb7 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0172-bcachefs-Don-t-call-bch2_btree_interior_update_will_.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0172-bcachefs-Don-t-call-bch2_btree_interior_update_will_.patch
@@ -1,7 +1,7 @@
-From 5c41a62d8805d02651c45944430eed40c44dcbe4 Mon Sep 17 00:00:00 2001
+From cea5427fbab13e53bbd2885955b47c3849c1befc Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 20:43:01 -0500
-Subject: [PATCH 172/213] bcachefs: Don't call
+Subject: [PATCH 172/233] bcachefs: Don't call
  bch2_btree_interior_update_will_free_node() until after update succeeds
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0173-bcachefs-kill-flags-param-to-bch2_subvolume_get.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0173-bcachefs-kill-flags-param-to-bch2_subvolume_get.patch
index a7987db..c4de930 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0173-bcachefs-kill-flags-param-to-bch2_subvolume_get.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0173-bcachefs-kill-flags-param-to-bch2_subvolume_get.patch
@@ -1,7 +1,7 @@
-From 95efa00b02c36a32e3362041cb8916f38df33373 Mon Sep 17 00:00:00 2001
+From 7dacc22d765601ef7a2f13ec006a36724e82be6b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 23:40:26 -0500
-Subject: [PATCH 173/213] bcachefs: kill flags param to bch2_subvolume_get()
+Subject: [PATCH 173/233] bcachefs: kill flags param to bch2_subvolume_get()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0174-bcachefs-factor-out-str_hash.c.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0174-bcachefs-factor-out-str_hash.c.patch
index 120dace..d03ed21 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0174-bcachefs-factor-out-str_hash.c.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0174-bcachefs-factor-out-str_hash.c.patch
@@ -1,7 +1,7 @@
-From 76b8f8587ddb35d23c0d6201d4da9b019d3547ea Mon Sep 17 00:00:00 2001
+From 0ecfac8b60c8ad86a9d60aa6e5ec3acaeeb96064 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 4 Dec 2024 23:36:33 -0500
-Subject: [PATCH 174/213] bcachefs: factor out str_hash.c
+Subject: [PATCH 174/233] bcachefs: factor out str_hash.c
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0175-bcachefs-Journal-space-calculations-should-skip-dura.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0175-bcachefs-Journal-space-calculations-should-skip-dura.patch
index 3f059f6..12b1814 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0175-bcachefs-Journal-space-calculations-should-skip-dura.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0175-bcachefs-Journal-space-calculations-should-skip-dura.patch
@@ -1,7 +1,7 @@
-From e96ef1bdec0c4124b2a393b3e1fd471f0b40cbad Mon Sep 17 00:00:00 2001
+From 6315b49e95cf0af5196f1931a019d63a02d2a2a1 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 5 Dec 2024 12:35:17 -0500
-Subject: [PATCH 175/213] bcachefs: Journal space calculations should skip
+Subject: [PATCH 175/233] bcachefs: Journal space calculations should skip
  durability=0 devices
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0176-bcachefs-fix-bch2_btree_node_header_to_text-format-s.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0176-bcachefs-fix-bch2_btree_node_header_to_text-format-s.patch
index 09278b9..18167c8 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0176-bcachefs-fix-bch2_btree_node_header_to_text-format-s.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0176-bcachefs-fix-bch2_btree_node_header_to_text-format-s.patch
@@ -1,7 +1,7 @@
-From fc417681064b23a0653db2b514e5ba501323dba3 Mon Sep 17 00:00:00 2001
+From 8ceb549abdc9d97f2faba341ae7755d876d480a1 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 6 Dec 2024 20:11:16 -0500
-Subject: [PATCH 176/213] bcachefs: fix bch2_btree_node_header_to_text() format
+Subject: [PATCH 176/233] bcachefs: fix bch2_btree_node_header_to_text() format
  string
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0177-bcachefs-Mark-more-errors-autofix.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0177-bcachefs-Mark-more-errors-autofix.patch
index d9e0d5e..eef1155 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0177-bcachefs-Mark-more-errors-autofix.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0177-bcachefs-Mark-more-errors-autofix.patch
@@ -1,7 +1,7 @@
-From 4eada2b3bd1b15709975b88d5373185159d3fe16 Mon Sep 17 00:00:00 2001
+From 2c77b170156262024d9b91795ee8f1531b444d70 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 6 Dec 2024 19:49:46 -0500
-Subject: [PATCH 177/213] bcachefs: Mark more errors autofix
+Subject: [PATCH 177/233] bcachefs: Mark more errors autofix
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0178-bcachefs-Minor-bucket-alloc-optimization.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0178-bcachefs-Minor-bucket-alloc-optimization.patch
index 61437a5..1d3a450 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0178-bcachefs-Minor-bucket-alloc-optimization.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0178-bcachefs-Minor-bucket-alloc-optimization.patch
@@ -1,7 +1,7 @@
-From 43634df268ae4fdd678986b387820d5d1cc635b6 Mon Sep 17 00:00:00 2001
+From e0e0d738ca9a0a34e7023f42abf56f570d3106d5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 6 Dec 2024 22:37:42 -0500
-Subject: [PATCH 178/213] bcachefs: Minor bucket alloc optimization
+Subject: [PATCH 178/233] bcachefs: Minor bucket alloc optimization
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0179-lib-min_heap-Switch-to-size_t.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0179-lib-min_heap-Switch-to-size_t.patch
index 83be4c7..936cb0a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0179-lib-min_heap-Switch-to-size_t.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0179-lib-min_heap-Switch-to-size_t.patch
@@ -1,7 +1,7 @@
-From 0587df6b11afb80a767cc106463e772e7f7c82fa Mon Sep 17 00:00:00 2001
+From 05cb2a44a9ed0b1f5151702a334011bd884c2641 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 6 Dec 2024 19:16:02 -0500
-Subject: [PATCH 179/213] lib min_heap: Switch to size_t
+Subject: [PATCH 179/233] lib min_heap: Switch to size_t
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0180-bcachefs-Use-a-heap-for-handling-overwrites-in-btree.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0180-bcachefs-Use-a-heap-for-handling-overwrites-in-btree.patch
index a93a5d5..527aa0c 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0180-bcachefs-Use-a-heap-for-handling-overwrites-in-btree.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0180-bcachefs-Use-a-heap-for-handling-overwrites-in-btree.patch
@@ -1,7 +1,7 @@
-From a82116a7206ba5e79e3a5aeae7860d79440241ea Mon Sep 17 00:00:00 2001
+From 488249b3f6257c8db748bcb27efad901481060e5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 6 Dec 2024 19:23:22 -0500
-Subject: [PATCH 180/213] bcachefs: Use a heap for handling overwrites in btree
+Subject: [PATCH 180/233] bcachefs: Use a heap for handling overwrites in btree
  node scan
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0181-bcachefs-Plumb-bkey_validate_context-to-journal_entr.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0181-bcachefs-Plumb-bkey_validate_context-to-journal_entr.patch
index 0fa525e..c673224 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0181-bcachefs-Plumb-bkey_validate_context-to-journal_entr.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0181-bcachefs-Plumb-bkey_validate_context-to-journal_entr.patch
@@ -1,7 +1,7 @@
-From e240d57b1011dace567a4fa59d8f42427a1ba56f Mon Sep 17 00:00:00 2001
+From e8d604148bad3ccb9a7cac1cb7ebb613b73fc51b Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 7 Dec 2024 21:36:15 -0500
-Subject: [PATCH 181/213] bcachefs: Plumb bkey_validate_context to
+Subject: [PATCH 181/233] bcachefs: Plumb bkey_validate_context to
  journal_entry_validate
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0182-bcachefs-Don-t-add-unknown-accounting-types-to-eytzi.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0182-bcachefs-Don-t-add-unknown-accounting-types-to-eytzi.patch
index 9e1d4b0..d52509f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0182-bcachefs-Don-t-add-unknown-accounting-types-to-eytzi.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0182-bcachefs-Don-t-add-unknown-accounting-types-to-eytzi.patch
@@ -1,7 +1,7 @@
-From fab3842a34968acda6316bc0ae3c7d0ab326ecdc Mon Sep 17 00:00:00 2001
+From 8f367a5c8eb16059e43f8a329c894c380c0e2bc1 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 5 Dec 2024 12:35:43 -0500
-Subject: [PATCH 182/213] bcachefs: Don't add unknown accounting types to
+Subject: [PATCH 182/233] bcachefs: Don't add unknown accounting types to
  eytzinger tree
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0183-bcachefs-Set-bucket-needs-discard-inc-gen-on-empty-n.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0183-bcachefs-Set-bucket-needs-discard-inc-gen-on-empty-n.patch
index abd5ed8..f078d47 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0183-bcachefs-Set-bucket-needs-discard-inc-gen-on-empty-n.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0183-bcachefs-Set-bucket-needs-discard-inc-gen-on-empty-n.patch
@@ -1,7 +1,7 @@
-From 1760dffbf20b64871ad46db509c760c7718fba8c Mon Sep 17 00:00:00 2001
+From f3b4692b79f930695b312a7192f0bc8f260af9ff Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 7 Dec 2024 20:43:07 -0500
-Subject: [PATCH 183/213] bcachefs: Set bucket needs discard, inc gen on empty
+Subject: [PATCH 183/233] bcachefs: Set bucket needs discard, inc gen on empty
  -> nonempty transition
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0184-bcachefs-bch2_journal_noflush_seq-now-takes-start-en.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0184-bcachefs-bch2_journal_noflush_seq-now-takes-start-en.patch
index 70436c9..71ed2a5 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0184-bcachefs-bch2_journal_noflush_seq-now-takes-start-en.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0184-bcachefs-bch2_journal_noflush_seq-now-takes-start-en.patch
@@ -1,7 +1,7 @@
-From 3a201f8ca2c05cbec4a17a7e2566513f9748b902 Mon Sep 17 00:00:00 2001
+From c106801642fe12b22001489702d42643103425ef Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 00:28:16 -0500
-Subject: [PATCH 184/213] bcachefs: bch2_journal_noflush_seq() now takes
+Subject: [PATCH 184/233] bcachefs: bch2_journal_noflush_seq() now takes
  [start, end)
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0185-bcachefs-Fix-reuse-of-bucket-before-journal-flush-on.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0185-bcachefs-Fix-reuse-of-bucket-before-journal-flush-on.patch
index 2c17470..1193507 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0185-bcachefs-Fix-reuse-of-bucket-before-journal-flush-on.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0185-bcachefs-Fix-reuse-of-bucket-before-journal-flush-on.patch
@@ -1,7 +1,7 @@
-From 448efa4fb590f3ff87141f5f10728b278dbac6dc Mon Sep 17 00:00:00 2001
+From d7f6becfe039b95593c28ff8180b3b53a2585f69 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 6 Dec 2024 23:15:05 -0500
-Subject: [PATCH 185/213] bcachefs: Fix reuse of bucket before journal flush on
+Subject: [PATCH 185/233] bcachefs: Fix reuse of bucket before journal flush on
  multiple empty -> nonempty transition
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0186-bcachefs-Don-t-start-rewriting-btree-nodes-until-aft.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0186-bcachefs-Don-t-start-rewriting-btree-nodes-until-aft.patch
index 5345766..ac451f9 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0186-bcachefs-Don-t-start-rewriting-btree-nodes-until-aft.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0186-bcachefs-Don-t-start-rewriting-btree-nodes-until-aft.patch
@@ -1,7 +1,7 @@
-From eb0a27f6f4a7f0225cf680ddeb4586b46ee32599 Mon Sep 17 00:00:00 2001
+From 0939c611cef4c7f917295a42dfbd2f56bc249a34 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 9 Dec 2024 06:00:33 -0500
-Subject: [PATCH 186/213] bcachefs: Don't start rewriting btree nodes until
+Subject: [PATCH 186/233] bcachefs: Don't start rewriting btree nodes until
  after journal replay
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0187-bcachefs-Kill-unnecessary-mark_lock-usage.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0187-bcachefs-Kill-unnecessary-mark_lock-usage.patch
index 4bb2664..1c9e4c5 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0187-bcachefs-Kill-unnecessary-mark_lock-usage.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0187-bcachefs-Kill-unnecessary-mark_lock-usage.patch
@@ -1,7 +1,7 @@
-From 19292a61a6eb9e182bd450435b81eeeaa21645e2 Mon Sep 17 00:00:00 2001
+From 2a11567a57d5c84dd6bf99e80901d7561b677eb5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 04:11:21 -0500
-Subject: [PATCH 187/213] bcachefs: Kill unnecessary mark_lock usage
+Subject: [PATCH 187/233] bcachefs: Kill unnecessary mark_lock usage
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0188-bcachefs-kill-sysfs-internal-accounting.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0188-bcachefs-kill-sysfs-internal-accounting.patch
index 4967cfd..3097e7a 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0188-bcachefs-kill-sysfs-internal-accounting.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0188-bcachefs-kill-sysfs-internal-accounting.patch
@@ -1,7 +1,7 @@
-From 1a2c0d8861c03e47670f55f3cfffc406b4d17919 Mon Sep 17 00:00:00 2001
+From c5022a702e50321829219339841693ad5d0db035 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 20:55:03 -0500
-Subject: [PATCH 188/213] bcachefs: kill sysfs internal/accounting
+Subject: [PATCH 188/233] bcachefs: kill sysfs internal/accounting
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0189-bcachefs-Use-proper-errcodes-for-inode-unpack-errors.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0189-bcachefs-Use-proper-errcodes-for-inode-unpack-errors.patch
index 52c913f..ce3d675 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0189-bcachefs-Use-proper-errcodes-for-inode-unpack-errors.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0189-bcachefs-Use-proper-errcodes-for-inode-unpack-errors.patch
@@ -1,7 +1,7 @@
-From bc0510345e2afea0ab369c1af3e25d92a07d0566 Mon Sep 17 00:00:00 2001
+From 5cd80c5f33629a8f559b2f75a39ef49e782dbd27 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 21:42:49 -0500
-Subject: [PATCH 189/213] bcachefs: Use proper errcodes for inode unpack errors
+Subject: [PATCH 189/233] bcachefs: Use proper errcodes for inode unpack errors
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0190-bcachefs-Don-t-BUG_ON-inode-unpack-error.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0190-bcachefs-Don-t-BUG_ON-inode-unpack-error.patch
index 18f2264..54b84c4 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0190-bcachefs-Don-t-BUG_ON-inode-unpack-error.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0190-bcachefs-Don-t-BUG_ON-inode-unpack-error.patch
@@ -1,7 +1,7 @@
-From 4a5fca1cb1bb3855ebe5d4d2a2f2efc74b29c48d Mon Sep 17 00:00:00 2001
+From 90ae216d588636a18155188a1ef9626896260600 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 22:00:36 -0500
-Subject: [PATCH 190/213] bcachefs: Don't BUG_ON() inode unpack error
+Subject: [PATCH 190/233] bcachefs: Don't BUG_ON() inode unpack error
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0191-bcachefs-bch2_str_hash_check_key-now-checks-inode-ha.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0191-bcachefs-bch2_str_hash_check_key-now-checks-inode-ha.patch
index f112e69..e235cf6 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0191-bcachefs-bch2_str_hash_check_key-now-checks-inode-ha.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0191-bcachefs-bch2_str_hash_check_key-now-checks-inode-ha.patch
@@ -1,7 +1,7 @@
-From 4379193ed73ac578bc2b75c6200e7742a87d451e Mon Sep 17 00:00:00 2001
+From eccc694e143329be8be7d6c4fd212a9abf6f5987 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 21:47:34 -0500
-Subject: [PATCH 191/213] bcachefs: bch2_str_hash_check_key() now checks inode
+Subject: [PATCH 191/233] bcachefs: bch2_str_hash_check_key() now checks inode
  hash info
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0192-bcachefs-bch2_check_key_has_snapshot-prints-btree-id.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0192-bcachefs-bch2_check_key_has_snapshot-prints-btree-id.patch
index 6da05d8..9c3df12 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0192-bcachefs-bch2_check_key_has_snapshot-prints-btree-id.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0192-bcachefs-bch2_check_key_has_snapshot-prints-btree-id.patch
@@ -1,7 +1,7 @@
-From 6683849a817248b43c75c07762ba6396fd084682 Mon Sep 17 00:00:00 2001
+From d54b4f311f313e2a926cc9649d3c7a97187d00ee Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 22:30:19 -0500
-Subject: [PATCH 192/213] bcachefs: bch2_check_key_has_snapshot() prints btree
+Subject: [PATCH 192/233] bcachefs: bch2_check_key_has_snapshot() prints btree
  id
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0193-bcachefs-bch2_snapshot_exists.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0193-bcachefs-bch2_snapshot_exists.patch
index 1c1b2c9..2c88504 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0193-bcachefs-bch2_snapshot_exists.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0193-bcachefs-bch2_snapshot_exists.patch
@@ -1,7 +1,7 @@
-From 924aee5f73909145275d3e23134a74c04f673a82 Mon Sep 17 00:00:00 2001
+From 152c28eef5bd508af933704d19146352769dd6e8 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 9 Dec 2024 01:31:43 -0500
-Subject: [PATCH 193/213] bcachefs: bch2_snapshot_exists()
+Subject: [PATCH 193/233] bcachefs: bch2_snapshot_exists()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0194-bcachefs-trace_write_buffer_maybe_flush.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0194-bcachefs-trace_write_buffer_maybe_flush.patch
index 48ae008..f35a778 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0194-bcachefs-trace_write_buffer_maybe_flush.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0194-bcachefs-trace_write_buffer_maybe_flush.patch
@@ -1,7 +1,7 @@
-From 487d22a42a74568a7bcd0a9b27053048647e85db Mon Sep 17 00:00:00 2001
+From 42c1d1a9549ce73cc877d785f67e0152cacfd279 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 10 Dec 2024 10:29:12 -0500
-Subject: [PATCH 194/213] bcachefs: trace_write_buffer_maybe_flush
+Subject: [PATCH 194/233] bcachefs: trace_write_buffer_maybe_flush
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0195-bcachefs-Add-empty-statement-between-label-and-decla.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0195-bcachefs-Add-empty-statement-between-label-and-decla.patch
index a20567a..a9db8ef 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0195-bcachefs-Add-empty-statement-between-label-and-decla.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0195-bcachefs-Add-empty-statement-between-label-and-decla.patch
@@ -1,7 +1,7 @@
-From 9b282323644d59c6085b6b4e23307a515c0a37f7 Mon Sep 17 00:00:00 2001
+From cee2a479acb23e673fdff0ad20041d10a678676c Mon Sep 17 00:00:00 2001
 From: Nathan Chancellor <nathan@kernel.org>
 Date: Tue, 10 Dec 2024 11:12:07 -0700
-Subject: [PATCH 195/213] bcachefs: Add empty statement between label and
+Subject: [PATCH 195/233] bcachefs: Add empty statement between label and
  declaration in check_inode_hash_info_matches_root()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0196-bcachefs-Refactor-c-opts.reconstruct_alloc.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0196-bcachefs-Refactor-c-opts.reconstruct_alloc.patch
index 4160304..a804161 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0196-bcachefs-Refactor-c-opts.reconstruct_alloc.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0196-bcachefs-Refactor-c-opts.reconstruct_alloc.patch
@@ -1,7 +1,7 @@
-From 491b6a11f232f81634ad4cf3806d8b700aa94886 Mon Sep 17 00:00:00 2001
+From bb4ae1459d12972bad07e9197b13d0a3e3e782e0 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 10 Dec 2024 13:23:47 -0500
-Subject: [PATCH 196/213] bcachefs: Refactor c->opts.reconstruct_alloc
+Subject: [PATCH 196/233] bcachefs: Refactor c->opts.reconstruct_alloc
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0197-bcachefs-check_indirect_extents-can-run-online.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0197-bcachefs-check_indirect_extents-can-run-online.patch
index 549199b..19fb861 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0197-bcachefs-check_indirect_extents-can-run-online.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0197-bcachefs-check_indirect_extents-can-run-online.patch
@@ -1,7 +1,7 @@
-From 946f631448fb8275b524f6089872d0d8857432ad Mon Sep 17 00:00:00 2001
+From cf44b080f7d9c6c7f7e17a4b3cfc3a7ddf7c0111 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 8 Dec 2024 21:10:27 -0500
-Subject: [PATCH 197/213] bcachefs: check_indirect_extents can run online
+Subject: [PATCH 197/233] bcachefs: check_indirect_extents can run online
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0198-bcachefs-tidy-up-__bch2_btree_iter_peek.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0198-bcachefs-tidy-up-__bch2_btree_iter_peek.patch
new file mode 100644
index 0000000..efaa28b
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0198-bcachefs-tidy-up-__bch2_btree_iter_peek.patch
@@ -0,0 +1,66 @@
+From 52ee09e70b8a9a04eaad4d9df65a6fcfc5fad43c Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 03:38:14 -0500
+Subject: [PATCH 198/233] bcachefs: tidy up __bch2_btree_iter_peek()
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_iter.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
+index 9c54891c737a..368ebcaf05fd 100644
+--- a/fs/bcachefs/btree_iter.c
++++ b/fs/bcachefs/btree_iter.c
+@@ -2260,7 +2260,7 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
+ 			/* ensure that iter->k is consistent with iter->pos: */
+ 			bch2_btree_iter_set_pos(iter, iter->pos);
+ 			k = bkey_s_c_err(ret);
+-			goto out;
++			break;
+ 		}
+ 
+ 		struct btree_path *path = btree_iter_path(trans, iter);
+@@ -2270,7 +2270,7 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
+ 			/* No btree nodes at requested level: */
+ 			bch2_btree_iter_set_pos(iter, SPOS_MAX);
+ 			k = bkey_s_c_null;
+-			goto out;
++			break;
+ 		}
+ 
+ 		btree_path_set_should_be_locked(trans, path);
+@@ -2281,10 +2281,9 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
+ 		    k.k &&
+ 		    (k2 = btree_trans_peek_key_cache(iter, k.k->p)).k) {
+ 			k = k2;
+-			ret = bkey_err(k);
+-			if (ret) {
++			if (bkey_err(k)) {
+ 				bch2_btree_iter_set_pos(iter, iter->pos);
+-				goto out;
++				break;
+ 			}
+ 		}
+ 
+@@ -2318,12 +2317,11 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
+ 			/* End of btree: */
+ 			bch2_btree_iter_set_pos(iter, SPOS_MAX);
+ 			k = bkey_s_c_null;
+-			goto out;
++			break;
+ 		}
+ 	}
+-out:
+-	bch2_btree_iter_verify(iter);
+ 
++	bch2_btree_iter_verify(iter);
+ 	return k;
+ }
+ 
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0199-bcachefs-tidy-btree_trans_peek_journal.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0199-bcachefs-tidy-btree_trans_peek_journal.patch
new file mode 100644
index 0000000..269188f
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0199-bcachefs-tidy-btree_trans_peek_journal.patch
@@ -0,0 +1,94 @@
+From eece59055ba456b267488446fca8dd2ba56b91e2 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Fri, 13 Dec 2024 06:02:24 -0500
+Subject: [PATCH 199/233] bcachefs: tidy btree_trans_peek_journal()
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Change to match bch2_btree_trans_peek_updates() calling convention.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_iter.c | 29 ++++++++++++-----------------
+ 1 file changed, 12 insertions(+), 17 deletions(-)
+
+diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
+index 368ebcaf05fd..51ebce9d5b5c 100644
+--- a/fs/bcachefs/btree_iter.c
++++ b/fs/bcachefs/btree_iter.c
+@@ -2144,21 +2144,18 @@ struct bkey_s_c btree_trans_peek_slot_journal(struct btree_trans *trans,
+ }
+ 
+ static noinline
+-struct bkey_s_c btree_trans_peek_journal(struct btree_trans *trans,
+-					 struct btree_iter *iter,
+-					 struct bkey_s_c k)
++void btree_trans_peek_journal(struct btree_trans *trans,
++			      struct btree_iter *iter,
++			      struct bkey_s_c *k)
+ {
+ 	struct btree_path *path = btree_iter_path(trans, iter);
+ 	struct bkey_i *next_journal =
+ 		bch2_btree_journal_peek(trans, iter,
+-				k.k ? k.k->p : path_l(path)->b->key.k.p);
+-
++				k->k ? k->k->p : path_l(path)->b->key.k.p);
+ 	if (next_journal) {
+ 		iter->k = next_journal->k;
+-		k = bkey_i_to_s_c(next_journal);
++		*k = bkey_i_to_s_c(next_journal);
+ 	}
+-
+-	return k;
+ }
+ 
+ static struct bkey_i *bch2_btree_journal_peek_prev(struct btree_trans *trans,
+@@ -2175,21 +2172,19 @@ static struct bkey_i *bch2_btree_journal_peek_prev(struct btree_trans *trans,
+ }
+ 
+ static noinline
+-struct bkey_s_c btree_trans_peek_prev_journal(struct btree_trans *trans,
+-					 struct btree_iter *iter,
+-					 struct bkey_s_c k)
++void btree_trans_peek_prev_journal(struct btree_trans *trans,
++				   struct btree_iter *iter,
++				   struct bkey_s_c *k)
+ {
+ 	struct btree_path *path = btree_iter_path(trans, iter);
+ 	struct bkey_i *next_journal =
+ 		bch2_btree_journal_peek_prev(trans, iter,
+-				k.k ? k.k->p : path_l(path)->b->key.k.p);
++				k->k ? k->k->p : path_l(path)->b->key.k.p);
+ 
+ 	if (next_journal) {
+ 		iter->k = next_journal->k;
+-		k = bkey_i_to_s_c(next_journal);
++		*k = bkey_i_to_s_c(next_journal);
+ 	}
+-
+-	return k;
+ }
+ 
+ /*
+@@ -2288,7 +2283,7 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
+ 		}
+ 
+ 		if (unlikely(iter->flags & BTREE_ITER_with_journal))
+-			k = btree_trans_peek_journal(trans, iter, k);
++			btree_trans_peek_journal(trans, iter, &k);
+ 
+ 		if (unlikely((iter->flags & BTREE_ITER_with_updates) &&
+ 			     trans->nr_updates))
+@@ -2545,7 +2540,7 @@ static struct bkey_s_c __bch2_btree_iter_peek_prev(struct btree_iter *iter, stru
+ 		}
+ 
+ 		if (unlikely(iter->flags & BTREE_ITER_with_journal))
+-			k = btree_trans_peek_prev_journal(trans, iter, k);
++			btree_trans_peek_prev_journal(trans, iter, &k);
+ 
+ 		if (unlikely((iter->flags & BTREE_ITER_with_updates) &&
+ 			     trans->nr_updates))
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0200-bcachefs-Fix-btree_trans_peek_key_cache-BTREE_ITER_a.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0200-bcachefs-Fix-btree_trans_peek_key_cache-BTREE_ITER_a.patch
new file mode 100644
index 0000000..cbf4146
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0200-bcachefs-Fix-btree_trans_peek_key_cache-BTREE_ITER_a.patch
@@ -0,0 +1,37 @@
+From bf5ec9b976f721411eb8c4962b75f3d5a630c073 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 02:26:15 -0500
+Subject: [PATCH 200/233] bcachefs: Fix btree_trans_peek_key_cache()
+ BTREE_ITER_all_snapshots
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+In BTREE_ITER_all_snapshots mode, we're required to only return keys
+where the snapshot field matches the iterator position -
+BTREE_ITER_filter_snapshots requires pulling keys into the key cache
+from ancestor snapshots, so we have to check for that.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_iter.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
+index 51ebce9d5b5c..e370fa327769 100644
+--- a/fs/bcachefs/btree_iter.c
++++ b/fs/bcachefs/btree_iter.c
+@@ -2230,6 +2230,10 @@ struct bkey_s_c btree_trans_peek_key_cache(struct btree_iter *iter, struct bpos
+ 
+ 	k = bch2_btree_path_peek_slot(trans->paths + iter->key_cache_path, &u);
+ 	if (k.k && !bkey_err(k)) {
++		if ((iter->flags & BTREE_ITER_all_snapshots) &&
++		    !bpos_eq(pos, k.k->p))
++			return bkey_s_c_null;
++
+ 		iter->k = u;
+ 		k.k = &iter->k;
+ 	}
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0201-bcachefs-Fix-key-cache-BTREE_ITER_all_snapshots.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0201-bcachefs-Fix-key-cache-BTREE_ITER_all_snapshots.patch
new file mode 100644
index 0000000..53ba24a
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0201-bcachefs-Fix-key-cache-BTREE_ITER_all_snapshots.patch
@@ -0,0 +1,60 @@
+From 760fbaf1a8f921d2b413d662d17a8c9056a0bdc4 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Fri, 13 Dec 2024 05:29:27 -0500
+Subject: [PATCH 201/233] bcachefs: Fix key cache + BTREE_ITER_all_snapshots
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Normally, whitouts (KEY_TYPE_whitout) are filtered from btree lookups,
+since they exist only to represent deletions of keys in ancestor
+snapshots - except, they should not be filtered in
+BTREE_ITER_all_snapshots mode, so that e.g. snapshot deletion can clean
+them up.
+
+This means that that the key cache has to store whiteouts, and key cache
+fills cannot filter them.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_iter.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
+index e370fa327769..b27944b62087 100644
+--- a/fs/bcachefs/btree_iter.c
++++ b/fs/bcachefs/btree_iter.c
+@@ -1854,7 +1854,7 @@ struct bkey_s_c bch2_btree_path_peek_slot(struct btree_path *path, struct bkey *
+ 			!bkey_eq(path->pos, ck->key.pos));
+ 
+ 		*u = ck->k->k;
+-		k = bkey_i_to_s_c(ck->k);
++		k = (struct bkey_s_c) { u, &ck->k->v };
+ 	}
+ 
+ 	return k;
+@@ -2421,7 +2421,8 @@ struct bkey_s_c bch2_btree_iter_peek_max(struct btree_iter *iter, struct bpos en
+ 				continue;
+ 			}
+ 
+-			if (bkey_whiteout(k.k)) {
++			if (bkey_whiteout(k.k) &&
++			    !(iter->flags & BTREE_ITER_key_cache_fill)) {
+ 				search_key = bkey_successor(iter, k.k->p);
+ 				continue;
+ 			}
+@@ -2781,6 +2782,11 @@ struct bkey_s_c bch2_btree_iter_peek_slot(struct btree_iter *iter)
+ 		k = bch2_btree_path_peek_slot(trans->paths + iter->path, &iter->k);
+ 		if (unlikely(!k.k))
+ 			goto out_no_locked;
++
++		if (unlikely(k.k->type == KEY_TYPE_whiteout &&
++			     (iter->flags & BTREE_ITER_filter_snapshots) &&
++			     !(iter->flags & BTREE_ITER_key_cache_fill)))
++			iter->k.type = KEY_TYPE_deleted;
+ 	} else {
+ 		struct bpos next;
+ 		struct bpos end = iter->pos;
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0202-bcachefs-alloc_data_type_set-happens-in-alloc-trigge.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0202-bcachefs-alloc_data_type_set-happens-in-alloc-trigge.patch
new file mode 100644
index 0000000..901ee15
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0202-bcachefs-alloc_data_type_set-happens-in-alloc-trigge.patch
@@ -0,0 +1,81 @@
+From 395d7f5e2438f5a5f70f7cbcc7b3873629e15d14 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 02:32:32 -0500
+Subject: [PATCH 202/233] bcachefs: alloc_data_type_set() happens in alloc
+ trigger
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Originally, we ran insert triggers before overwrite so that if an extent
+was being moved (by fallocate insert/collapse range), the bucket sector
+count wouldn't hit 0 partway through, and so we don't trigger state
+changes caused by that too soon.
+
+But this is better solved by just moving the data type change to the
+alloc trigger itself, where it's already called.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_gc.c |  1 -
+ fs/bcachefs/buckets.c  | 11 ++++++-----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
+index e5ba7d1429b9..5aa11ca08c94 100644
+--- a/fs/bcachefs/btree_gc.c
++++ b/fs/bcachefs/btree_gc.c
+@@ -1134,7 +1134,6 @@ static int bch2_alloc_write_oldest_gen(struct btree_trans *trans, struct bch_dev
+ 		return ret;
+ 
+ 	a_mut->v.oldest_gen = ca->oldest_gen[iter->pos.offset];
+-	alloc_data_type_set(&a_mut->v, a_mut->v.data_type);
+ 
+ 	return bch2_trans_update(trans, iter, &a_mut->k_i, 0);
+ }
+diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
+index eb2ed4edbbbc..bbd37b1ed5d2 100644
+--- a/fs/bcachefs/buckets.c
++++ b/fs/bcachefs/buckets.c
+@@ -541,7 +541,8 @@ static int __mark_pointer(struct btree_trans *trans, struct bch_dev *ca,
+ 			  struct bkey_s_c k,
+ 			  const struct extent_ptr_decoded *p,
+ 			  s64 sectors, enum bch_data_type ptr_data_type,
+-			  struct bch_alloc_v4 *a)
++			  struct bch_alloc_v4 *a,
++			  bool insert)
+ {
+ 	u32 *dst_sectors = p->has_ec	? &a->stripe_sectors :
+ 		!p->ptr.cached		? &a->dirty_sectors :
+@@ -551,8 +552,8 @@ static int __mark_pointer(struct btree_trans *trans, struct bch_dev *ca,
+ 
+ 	if (ret)
+ 		return ret;
+-
+-	alloc_data_type_set(a, ptr_data_type);
++	if (insert)
++		alloc_data_type_set(a, ptr_data_type);
+ 	return 0;
+ }
+ 
+@@ -585,7 +586,7 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
+ 	if (flags & BTREE_TRIGGER_transactional) {
+ 		struct bkey_i_alloc_v4 *a = bch2_trans_start_alloc_update(trans, bucket, 0);
+ 		ret = PTR_ERR_OR_ZERO(a) ?:
+-			__mark_pointer(trans, ca, k, &p, *sectors, bp.v.data_type, &a->v);
++			__mark_pointer(trans, ca, k, &p, *sectors, bp.v.data_type, &a->v, insert);
+ 		if (ret)
+ 			goto err;
+ 
+@@ -607,7 +608,7 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
+ 
+ 		bucket_lock(g);
+ 		struct bch_alloc_v4 old = bucket_m_to_alloc(*g), new = old;
+-		ret = __mark_pointer(trans, ca, k, &p, *sectors, bp.v.data_type, &new);
++		ret = __mark_pointer(trans, ca, k, &p, *sectors, bp.v.data_type, &new, insert);
+ 		alloc_to_bucket(g, new);
+ 		bucket_unlock(g);
+ 
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0203-bcachefs-Don-t-run-overwrite-triggers-before-insert.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0203-bcachefs-Don-t-run-overwrite-triggers-before-insert.patch
new file mode 100644
index 0000000..71989af
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0203-bcachefs-Don-t-run-overwrite-triggers-before-insert.patch
@@ -0,0 +1,148 @@
+From 75bca410520b1bd8ec4417d1c266124c5c8b9d76 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 02:27:52 -0500
+Subject: [PATCH 203/233] bcachefs: Don't run overwrite triggers before insert
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+This breaks when the trigger is inserting updates for the same btree, as
+the inode trigger now does.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_trans_commit.c | 81 +++++++++++++++-----------------
+ 1 file changed, 37 insertions(+), 44 deletions(-)
+
+diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c
+index 9011cc3f7190..c3a3bfd11e8c 100644
+--- a/fs/bcachefs/btree_trans_commit.c
++++ b/fs/bcachefs/btree_trans_commit.c
+@@ -479,8 +479,7 @@ static int run_one_mem_trigger(struct btree_trans *trans,
+ 				old, flags);
+ }
+ 
+-static int run_one_trans_trigger(struct btree_trans *trans, struct btree_insert_entry *i,
+-				 bool overwrite)
++static int run_one_trans_trigger(struct btree_trans *trans, struct btree_insert_entry *i)
+ {
+ 	verify_update_old_key(trans, i);
+ 
+@@ -507,10 +506,10 @@ static int run_one_trans_trigger(struct btree_trans *trans, struct btree_insert_
+ 		return bch2_key_trigger(trans, i->btree_id, i->level, old, bkey_i_to_s(i->k),
+ 					BTREE_TRIGGER_insert|
+ 					BTREE_TRIGGER_overwrite|flags) ?: 1;
+-	} else if (overwrite && !i->overwrite_trigger_run) {
++	} else if (!i->overwrite_trigger_run) {
+ 		i->overwrite_trigger_run = true;
+ 		return bch2_key_trigger_old(trans, i->btree_id, i->level, old, flags) ?: 1;
+-	} else if (!overwrite && !i->insert_trigger_run) {
++	} else if (!i->insert_trigger_run) {
+ 		i->insert_trigger_run = true;
+ 		return bch2_key_trigger_new(trans, i->btree_id, i->level, bkey_i_to_s(i->k), flags) ?: 1;
+ 	} else {
+@@ -519,39 +518,45 @@ static int run_one_trans_trigger(struct btree_trans *trans, struct btree_insert_
+ }
+ 
+ static int run_btree_triggers(struct btree_trans *trans, enum btree_id btree_id,
+-			      unsigned btree_id_start)
++			      unsigned *btree_id_updates_start)
+ {
+-	for (int overwrite = 1; overwrite >= 0; --overwrite) {
+-		bool trans_trigger_run;
++	bool trans_trigger_run;
+ 
+-		/*
+-		 * Running triggers will append more updates to the list of updates as
+-		 * we're walking it:
+-		 */
+-		do {
+-			trans_trigger_run = false;
+-
+-			for (unsigned i = btree_id_start;
+-			     i < trans->nr_updates && trans->updates[i].btree_id <= btree_id;
+-			     i++) {
+-				if (trans->updates[i].btree_id != btree_id)
+-					continue;
++	/*
++	 * Running triggers will append more updates to the list of updates as
++	 * we're walking it:
++	 */
++	do {
++		trans_trigger_run = false;
+ 
+-				int ret = run_one_trans_trigger(trans, trans->updates + i, overwrite);
+-				if (ret < 0)
+-					return ret;
+-				if (ret)
+-					trans_trigger_run = true;
++		for (unsigned i = *btree_id_updates_start;
++		     i < trans->nr_updates && trans->updates[i].btree_id <= btree_id;
++		     i++) {
++			if (trans->updates[i].btree_id < btree_id) {
++				*btree_id_updates_start = i;
++				continue;
+ 			}
+-		} while (trans_trigger_run);
+-	}
++
++			int ret = run_one_trans_trigger(trans, trans->updates + i);
++			if (ret < 0)
++				return ret;
++			if (ret)
++				trans_trigger_run = true;
++		}
++	} while (trans_trigger_run);
++
++	trans_for_each_update(trans, i)
++		BUG_ON(!(i->flags & BTREE_TRIGGER_norun) &&
++		       i->btree_id == btree_id &&
++		       btree_node_type_has_trans_triggers(i->bkey_type) &&
++		       (!i->insert_trigger_run || !i->overwrite_trigger_run));
+ 
+ 	return 0;
+ }
+ 
+ static int bch2_trans_commit_run_triggers(struct btree_trans *trans)
+ {
+-	unsigned btree_id = 0, btree_id_start = 0;
++	unsigned btree_id = 0, btree_id_updates_start = 0;
+ 	int ret = 0;
+ 
+ 	/*
+@@ -565,27 +570,15 @@ static int bch2_trans_commit_run_triggers(struct btree_trans *trans)
+ 		if (btree_id == BTREE_ID_alloc)
+ 			continue;
+ 
+-		while (btree_id_start < trans->nr_updates &&
+-		       trans->updates[btree_id_start].btree_id < btree_id)
+-			btree_id_start++;
+-
+-		ret = run_btree_triggers(trans, btree_id, btree_id_start);
++		ret = run_btree_triggers(trans, btree_id, &btree_id_updates_start);
+ 		if (ret)
+ 			return ret;
+ 	}
+ 
+-	for (unsigned idx = 0; idx < trans->nr_updates; idx++) {
+-		struct btree_insert_entry *i = trans->updates + idx;
+-
+-		if (i->btree_id > BTREE_ID_alloc)
+-			break;
+-		if (i->btree_id == BTREE_ID_alloc) {
+-			ret = run_btree_triggers(trans, BTREE_ID_alloc, idx);
+-			if (ret)
+-				return ret;
+-			break;
+-		}
+-	}
++	btree_id_updates_start = 0;
++	ret = run_btree_triggers(trans, BTREE_ID_alloc, &btree_id_updates_start);
++	if (ret)
++		return ret;
+ 
+ #ifdef CONFIG_BCACHEFS_DEBUG
+ 	trans_for_each_update(trans, i)
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0204-bcachefs-Kill-equiv_seen-arg-to-delete_dead_snapshot.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0204-bcachefs-Kill-equiv_seen-arg-to-delete_dead_snapshot.patch
new file mode 100644
index 0000000..aea4f09
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0204-bcachefs-Kill-equiv_seen-arg-to-delete_dead_snapshot.patch
@@ -0,0 +1,123 @@
+From 46f92a9e9932872336ed485b0152ae560d3e2907 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 02:41:37 -0500
+Subject: [PATCH 204/233] bcachefs: Kill equiv_seen arg to
+ delete_dead_snapshots_process_key()
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+When deleting dead snapshots, we move keys from redundant interior
+snapshot nodes to child nodes - unless there's already a key, in which
+case the ancestor key is deleted.
+
+Previously, we tracked via equiv_seen whether the child snapshot had a
+key, but this was tricky w.r.t. transaction restarts, and not
+transactionally safe w.r.t. updates in the child snapshot.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/snapshot.c | 51 ++++++++++++++----------------------------
+ 1 file changed, 17 insertions(+), 34 deletions(-)
+
+diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c
+index ac664888847f..ca7e4e975a60 100644
+--- a/fs/bcachefs/snapshot.c
++++ b/fs/bcachefs/snapshot.c
+@@ -1421,9 +1421,7 @@ int bch2_snapshot_node_create(struct btree_trans *trans, u32 parent,
+ static int delete_dead_snapshots_process_key(struct btree_trans *trans,
+ 			       struct btree_iter *iter,
+ 			       struct bkey_s_c k,
+-			       snapshot_id_list *deleted,
+-			       snapshot_id_list *equiv_seen,
+-			       struct bpos *last_pos)
++			       snapshot_id_list *deleted)
+ {
+ 	int ret = bch2_check_key_has_snapshot(trans, iter, k);
+ 	if (ret)
+@@ -1434,24 +1432,10 @@ static int delete_dead_snapshots_process_key(struct btree_trans *trans,
+ 	if (!equiv) /* key for invalid snapshot node, but we chose not to delete */
+ 		return 0;
+ 
+-	if (!bkey_eq(k.k->p, *last_pos))
+-		equiv_seen->nr = 0;
+-
+ 	if (snapshot_list_has_id(deleted, k.k->p.snapshot))
+ 		return bch2_btree_delete_at(trans, iter,
+ 					    BTREE_UPDATE_internal_snapshot_node);
+ 
+-	if (!bpos_eq(*last_pos, k.k->p) &&
+-	    snapshot_list_has_id(equiv_seen, equiv))
+-		return bch2_btree_delete_at(trans, iter,
+-					    BTREE_UPDATE_internal_snapshot_node);
+-
+-	*last_pos = k.k->p;
+-
+-	ret = snapshot_list_add_nodup(c, equiv_seen, equiv);
+-	if (ret)
+-		return ret;
+-
+ 	/*
+ 	 * When we have a linear chain of snapshot nodes, we consider
+ 	 * those to form an equivalence class: we're going to collapse
+@@ -1473,20 +1457,23 @@ static int delete_dead_snapshots_process_key(struct btree_trans *trans,
+ 
+ 		new->k.p.snapshot = equiv;
+ 
+-		struct btree_iter new_iter;
+-		bch2_trans_iter_init(trans, &new_iter, iter->btree_id, new->k.p,
+-				     BTREE_ITER_all_snapshots|
+-				     BTREE_ITER_cached|
+-				     BTREE_ITER_intent);
+-
+-		ret =   bch2_btree_iter_traverse(&new_iter) ?:
+-			bch2_trans_update(trans, &new_iter, new,
+-					BTREE_UPDATE_internal_snapshot_node) ?:
+-			bch2_btree_delete_at(trans, iter,
+-					BTREE_UPDATE_internal_snapshot_node);
+-		bch2_trans_iter_exit(trans, &new_iter);
++		struct btree_iter dst_iter;
++		struct bkey_s_c dst_k = bch2_bkey_get_iter(trans, &dst_iter,
++							   iter->btree_id, new->k.p,
++							   BTREE_ITER_all_snapshots|
++							   BTREE_ITER_intent);
++		ret = bkey_err(dst_k);
+ 		if (ret)
+ 			return ret;
++
++		ret =   (bkey_deleted(dst_k.k)
++			 ? bch2_trans_update(trans, &dst_iter, new,
++					     BTREE_UPDATE_internal_snapshot_node)
++			 : 0) ?:
++			bch2_btree_delete_at(trans, iter,
++					     BTREE_UPDATE_internal_snapshot_node);
++		bch2_trans_iter_exit(trans, &dst_iter);
++		return ret;
+ 	}
+ 
+ 	return 0;
+@@ -1648,8 +1635,6 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
+ 		goto err;
+ 
+ 	for (unsigned btree = 0; btree < BTREE_ID_NR; btree++) {
+-		struct bpos last_pos = POS_MIN;
+-		snapshot_id_list equiv_seen = { 0 };
+ 		struct disk_reservation res = { 0 };
+ 
+ 		if (!btree_type_has_snapshots(btree))
+@@ -1659,11 +1644,9 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
+ 				btree, POS_MIN,
+ 				BTREE_ITER_prefetch|BTREE_ITER_all_snapshots, k,
+ 				&res, NULL, BCH_TRANS_COMMIT_no_enospc,
+-			delete_dead_snapshots_process_key(trans, &iter, k, &deleted,
+-							  &equiv_seen, &last_pos));
++			delete_dead_snapshots_process_key(trans, &iter, k, &deleted));
+ 
+ 		bch2_disk_reservation_put(c, &res);
+-		darray_exit(&equiv_seen);
+ 
+ 		bch_err_msg(c, ret, "deleting keys from dying snapshots");
+ 		if (ret)
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0205-bcachefs-Snapshot-deletion-no-longer-uses-snapshot_t.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0205-bcachefs-Snapshot-deletion-no-longer-uses-snapshot_t.patch
new file mode 100644
index 0000000..763ed8f
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0205-bcachefs-Snapshot-deletion-no-longer-uses-snapshot_t.patch
@@ -0,0 +1,428 @@
+From 7c410e21d8bb472455e57fdbf174c6accb3d9a78 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 03:03:58 -0500
+Subject: [PATCH 205/233] bcachefs: Snapshot deletion no longer uses
+ snapshot_t->equiv
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Switch to generating a private list of interior nodes to delete, instead
+of using the equivalence class in the global data structure.
+
+This eliminates possible races with snapshot creation, and is much
+cleaner - it'll let us delete a lot of janky code for calculating and
+maintaining the equivalence classes.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/snapshot.c | 268 ++++++++++++++++++++---------------------
+ 1 file changed, 133 insertions(+), 135 deletions(-)
+
+diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c
+index ca7e4e975a60..0d60251946f1 100644
+--- a/fs/bcachefs/snapshot.c
++++ b/fs/bcachefs/snapshot.c
+@@ -1418,44 +1418,74 @@ int bch2_snapshot_node_create(struct btree_trans *trans, u32 parent,
+  * that key to snapshot leaf nodes, where we can mutate it
+  */
+ 
+-static int delete_dead_snapshots_process_key(struct btree_trans *trans,
+-			       struct btree_iter *iter,
+-			       struct bkey_s_c k,
+-			       snapshot_id_list *deleted)
++struct snapshot_interior_delete {
++	u32	id;
++	u32	live_child;
++};
++typedef DARRAY(struct snapshot_interior_delete) interior_delete_list;
++
++static inline u32 interior_delete_has_id(interior_delete_list *l, u32 id)
+ {
+-	int ret = bch2_check_key_has_snapshot(trans, iter, k);
+-	if (ret)
+-		return ret < 0 ? ret : 0;
++	darray_for_each(*l, i)
++		if (i->id == id)
++			return i->live_child;
++	return 0;
++}
+ 
+-	struct bch_fs *c = trans->c;
+-	u32 equiv = bch2_snapshot_equiv(c, k.k->p.snapshot);
+-	if (!equiv) /* key for invalid snapshot node, but we chose not to delete */
++static unsigned __live_child(struct snapshot_table *t, u32 id,
++			     snapshot_id_list *delete_leaves,
++			     interior_delete_list *delete_interior)
++{
++	struct snapshot_t *s = __snapshot_t(t, id);
++	if (!s)
+ 		return 0;
+ 
+-	if (snapshot_list_has_id(deleted, k.k->p.snapshot))
++	for (unsigned i = 0; i < ARRAY_SIZE(s->children); i++)
++		if (s->children[i] &&
++		    !snapshot_list_has_id(delete_leaves, s->children[i]) &&
++		    !interior_delete_has_id(delete_interior, s->children[i]))
++			return s->children[i];
++
++	for (unsigned i = 0; i < ARRAY_SIZE(s->children); i++) {
++		u32 live_child = s->children[i]
++			? __live_child(t, s->children[i], delete_leaves, delete_interior)
++			: 0;
++		if (live_child)
++			return live_child;
++	}
++
++	return 0;
++}
++
++static unsigned live_child(struct bch_fs *c, u32 id,
++			   snapshot_id_list *delete_leaves,
++			   interior_delete_list *delete_interior)
++{
++	rcu_read_lock();
++	u32 ret = __live_child(rcu_dereference(c->snapshots), id,
++			       delete_leaves, delete_interior);
++	rcu_read_unlock();
++	return ret;
++}
++
++static int delete_dead_snapshots_process_key(struct btree_trans *trans,
++					     struct btree_iter *iter,
++					     struct bkey_s_c k,
++					     snapshot_id_list *delete_leaves,
++					     interior_delete_list *delete_interior)
++{
++	if (snapshot_list_has_id(delete_leaves, k.k->p.snapshot))
+ 		return bch2_btree_delete_at(trans, iter,
+ 					    BTREE_UPDATE_internal_snapshot_node);
+ 
+-	/*
+-	 * When we have a linear chain of snapshot nodes, we consider
+-	 * those to form an equivalence class: we're going to collapse
+-	 * them all down to a single node, and keep the leaf-most node -
+-	 * which has the same id as the equivalence class id.
+-	 *
+-	 * If there are multiple keys in different snapshots at the same
+-	 * position, we're only going to keep the one in the newest
+-	 * snapshot (we delete the others above) - the rest have been
+-	 * overwritten and are redundant, and for the key we're going to keep we
+-	 * need to move it to the equivalance class ID if it's not there
+-	 * already.
+-	 */
+-	if (equiv != k.k->p.snapshot) {
++	u32 live_child = interior_delete_has_id(delete_interior, k.k->p.snapshot);
++	if (live_child) {
+ 		struct bkey_i *new = bch2_bkey_make_mut_noupdate(trans, k);
+ 		int ret = PTR_ERR_OR_ZERO(new);
+ 		if (ret)
+ 			return ret;
+ 
+-		new->k.p.snapshot = equiv;
++		new->k.p.snapshot = live_child;
+ 
+ 		struct btree_iter dst_iter;
+ 		struct bkey_s_c dst_k = bch2_bkey_get_iter(trans, &dst_iter,
+@@ -1479,55 +1509,62 @@ static int delete_dead_snapshots_process_key(struct btree_trans *trans,
+ 	return 0;
+ }
+ 
+-static int bch2_snapshot_needs_delete(struct btree_trans *trans, struct bkey_s_c k)
++/*
++ * For a given snapshot, if it doesn't have a subvolume that points to it, and
++ * it doesn't have child snapshot nodes - it's now redundant and we can mark it
++ * as deleted.
++ */
++static int check_should_delete_snapshot(struct btree_trans *trans, struct bkey_s_c k,
++					snapshot_id_list *delete_leaves,
++					interior_delete_list *delete_interior)
+ {
+-	struct bkey_s_c_snapshot snap;
+-	u32 children[2];
+-	int ret;
+-
+ 	if (k.k->type != KEY_TYPE_snapshot)
+ 		return 0;
+ 
+-	snap = bkey_s_c_to_snapshot(k);
+-	if (BCH_SNAPSHOT_DELETED(snap.v) ||
+-	    BCH_SNAPSHOT_SUBVOL(snap.v))
++	struct bch_fs *c = trans->c;
++	struct bkey_s_c_snapshot s = bkey_s_c_to_snapshot(k);
++	unsigned live_children = 0;
++
++	if (BCH_SNAPSHOT_SUBVOL(s.v))
+ 		return 0;
+ 
+-	children[0] = le32_to_cpu(snap.v->children[0]);
+-	children[1] = le32_to_cpu(snap.v->children[1]);
++	for (unsigned i = 0; i < 2; i++) {
++		u32 child = le32_to_cpu(s.v->children[i]);
+ 
+-	ret   = bch2_snapshot_live(trans, children[0]) ?:
+-		bch2_snapshot_live(trans, children[1]);
+-	if (ret < 0)
+-		return ret;
+-	return !ret;
+-}
++		live_children += child &&
++			!snapshot_list_has_id(delete_leaves, child);
++	}
+ 
+-/*
+- * For a given snapshot, if it doesn't have a subvolume that points to it, and
+- * it doesn't have child snapshot nodes - it's now redundant and we can mark it
+- * as deleted.
+- */
+-static int bch2_delete_redundant_snapshot(struct btree_trans *trans, struct bkey_s_c k)
+-{
+-	int ret = bch2_snapshot_needs_delete(trans, k);
++	if (live_children == 0) {
++		return snapshot_list_add(c, delete_leaves, s.k->p.offset);
++	} else if (live_children == 1) {
++		struct snapshot_interior_delete d = {
++			.id		= s.k->p.offset,
++			.live_child	= live_child(c, s.k->p.offset, delete_leaves, delete_interior),
++		};
++
++		if (!d.live_child) {
++			bch_err(c, "error finding live child of snapshot %u", d.id);
++			return -EINVAL;
++		}
+ 
+-	return ret <= 0
+-		? ret
+-		: bch2_snapshot_node_set_deleted(trans, k.k->p.offset);
++		return darray_push(delete_interior, d);
++	} else {
++		return 0;
++	}
+ }
+ 
+ static inline u32 bch2_snapshot_nth_parent_skip(struct bch_fs *c, u32 id, u32 n,
+-						snapshot_id_list *skip)
++						interior_delete_list *skip)
+ {
+ 	rcu_read_lock();
+-	while (snapshot_list_has_id(skip, id))
++	while (interior_delete_has_id(skip, id))
+ 		id = __bch2_snapshot_parent(c, id);
+ 
+ 	while (n--) {
+ 		do {
+ 			id = __bch2_snapshot_parent(c, id);
+-		} while (snapshot_list_has_id(skip, id));
++		} while (interior_delete_has_id(skip, id));
+ 	}
+ 	rcu_read_unlock();
+ 
+@@ -1536,7 +1573,7 @@ static inline u32 bch2_snapshot_nth_parent_skip(struct bch_fs *c, u32 id, u32 n,
+ 
+ static int bch2_fix_child_of_deleted_snapshot(struct btree_trans *trans,
+ 					      struct btree_iter *iter, struct bkey_s_c k,
+-					      snapshot_id_list *deleted)
++					      interior_delete_list *deleted)
+ {
+ 	struct bch_fs *c = trans->c;
+ 	u32 nr_deleted_ancestors = 0;
+@@ -1546,7 +1583,7 @@ static int bch2_fix_child_of_deleted_snapshot(struct btree_trans *trans,
+ 	if (k.k->type != KEY_TYPE_snapshot)
+ 		return 0;
+ 
+-	if (snapshot_list_has_id(deleted, k.k->p.offset))
++	if (interior_delete_has_id(deleted, k.k->p.offset))
+ 		return 0;
+ 
+ 	s = bch2_bkey_make_mut_noupdate_typed(trans, k, snapshot);
+@@ -1555,7 +1592,7 @@ static int bch2_fix_child_of_deleted_snapshot(struct btree_trans *trans,
+ 		return ret;
+ 
+ 	darray_for_each(*deleted, i)
+-		nr_deleted_ancestors += bch2_snapshot_is_ancestor(c, s->k.p.offset, *i);
++		nr_deleted_ancestors += bch2_snapshot_is_ancestor(c, s->k.p.offset, i->id);
+ 
+ 	if (!nr_deleted_ancestors)
+ 		return 0;
+@@ -1573,7 +1610,7 @@ static int bch2_fix_child_of_deleted_snapshot(struct btree_trans *trans,
+ 		for (unsigned j = 0; j < ARRAY_SIZE(s->v.skip); j++) {
+ 			u32 id = le32_to_cpu(s->v.skip[j]);
+ 
+-			if (snapshot_list_has_id(deleted, id)) {
++			if (interior_delete_has_id(deleted, id)) {
+ 				id = bch2_snapshot_nth_parent_skip(c,
+ 							parent,
+ 							depth > 1
+@@ -1592,46 +1629,25 @@ static int bch2_fix_child_of_deleted_snapshot(struct btree_trans *trans,
+ 
+ int bch2_delete_dead_snapshots(struct bch_fs *c)
+ {
+-	struct btree_trans *trans;
+-	snapshot_id_list deleted = { 0 };
+-	snapshot_id_list deleted_interior = { 0 };
+-	int ret = 0;
+-
+ 	if (!test_and_clear_bit(BCH_FS_need_delete_dead_snapshots, &c->flags))
+ 		return 0;
+ 
+-	trans = bch2_trans_get(c);
++	struct btree_trans *trans = bch2_trans_get(c);
++	snapshot_id_list delete_leaves = {};
++	interior_delete_list delete_interior = {};
++	int ret = 0;
+ 
+ 	/*
+ 	 * For every snapshot node: If we have no live children and it's not
+ 	 * pointed to by a subvolume, delete it:
+ 	 */
+-	ret = for_each_btree_key_commit(trans, iter, BTREE_ID_snapshots,
+-			POS_MIN, 0, k,
+-			NULL, NULL, 0,
+-		bch2_delete_redundant_snapshot(trans, k));
+-	bch_err_msg(c, ret, "deleting redundant snapshots");
+-	if (ret)
+-		goto err;
+-
+-	ret = for_each_btree_key(trans, iter, BTREE_ID_snapshots,
+-				 POS_MIN, 0, k,
+-		bch2_snapshot_set_equiv(trans, k));
+-	bch_err_msg(c, ret, "in bch2_snapshots_set_equiv");
++	ret = for_each_btree_key(trans, iter, BTREE_ID_snapshots, POS_MIN, 0, k,
++		check_should_delete_snapshot(trans, k, &delete_leaves, &delete_interior));
++	bch_err_msg(c, ret, "walking snapshots");
+ 	if (ret)
+ 		goto err;
+ 
+-	ret = for_each_btree_key(trans, iter, BTREE_ID_snapshots,
+-				 POS_MIN, 0, k, ({
+-		if (k.k->type != KEY_TYPE_snapshot)
+-			continue;
+-
+-		BCH_SNAPSHOT_DELETED(bkey_s_c_to_snapshot(k).v)
+-			? snapshot_list_add(c, &deleted, k.k->p.offset)
+-			: 0;
+-	}));
+-	bch_err_msg(c, ret, "walking snapshots");
+-	if (ret)
++	if (!delete_leaves.nr && !delete_interior.nr)
+ 		goto err;
+ 
+ 	for (unsigned btree = 0; btree < BTREE_ID_NR; btree++) {
+@@ -1644,7 +1660,9 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
+ 				btree, POS_MIN,
+ 				BTREE_ITER_prefetch|BTREE_ITER_all_snapshots, k,
+ 				&res, NULL, BCH_TRANS_COMMIT_no_enospc,
+-			delete_dead_snapshots_process_key(trans, &iter, k, &deleted));
++			delete_dead_snapshots_process_key(trans, &iter, k,
++							  &delete_leaves,
++							  &delete_interior));
+ 
+ 		bch2_disk_reservation_put(c, &res);
+ 
+@@ -1653,22 +1671,13 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
+ 			goto err;
+ 	}
+ 
+-	bch2_trans_unlock(trans);
+-	down_write(&c->snapshot_create_lock);
+-
+-	ret = for_each_btree_key(trans, iter, BTREE_ID_snapshots,
+-				 POS_MIN, 0, k, ({
+-		u32 snapshot = k.k->p.offset;
+-		u32 equiv = bch2_snapshot_equiv(c, snapshot);
+-
+-		equiv != snapshot
+-			? snapshot_list_add(c, &deleted_interior, snapshot)
+-			: 0;
+-	}));
+-
+-	bch_err_msg(c, ret, "walking snapshots");
+-	if (ret)
+-		goto err_create_lock;
++	darray_for_each(delete_leaves, i) {
++		ret = commit_do(trans, NULL, NULL, 0,
++			bch2_snapshot_node_delete(trans, *i));
++		bch_err_msg(c, ret, "deleting snapshot %u", *i);
++		if (ret)
++			goto err;
++	}
+ 
+ 	/*
+ 	 * Fixing children of deleted snapshots can't be done completely
+@@ -1678,30 +1687,20 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
+ 	ret = for_each_btree_key_commit(trans, iter, BTREE_ID_snapshots, POS_MIN,
+ 				  BTREE_ITER_intent, k,
+ 				  NULL, NULL, BCH_TRANS_COMMIT_no_enospc,
+-		bch2_fix_child_of_deleted_snapshot(trans, &iter, k, &deleted_interior));
++		bch2_fix_child_of_deleted_snapshot(trans, &iter, k, &delete_interior));
+ 	if (ret)
+-		goto err_create_lock;
+-
+-	darray_for_each(deleted, i) {
+-		ret = commit_do(trans, NULL, NULL, 0,
+-			bch2_snapshot_node_delete(trans, *i));
+-		bch_err_msg(c, ret, "deleting snapshot %u", *i);
+-		if (ret)
+-			goto err_create_lock;
+-	}
++		goto err;
+ 
+-	darray_for_each(deleted_interior, i) {
++	darray_for_each(delete_interior, i) {
+ 		ret = commit_do(trans, NULL, NULL, 0,
+-			bch2_snapshot_node_delete(trans, *i));
+-		bch_err_msg(c, ret, "deleting snapshot %u", *i);
++			bch2_snapshot_node_delete(trans, i->id));
++		bch_err_msg(c, ret, "deleting snapshot %u", i->id);
+ 		if (ret)
+-			goto err_create_lock;
++			goto err;
+ 	}
+-err_create_lock:
+-	up_write(&c->snapshot_create_lock);
+ err:
+-	darray_exit(&deleted_interior);
+-	darray_exit(&deleted);
++	darray_exit(&delete_interior);
++	darray_exit(&delete_leaves);
+ 	bch2_trans_put(trans);
+ 	bch_err_fn(c, ret);
+ 	return ret;
+@@ -1754,24 +1753,23 @@ int __bch2_key_has_snapshot_overwrites(struct btree_trans *trans,
+ 	return ret;
+ }
+ 
+-static int bch2_check_snapshot_needs_deletion(struct btree_trans *trans, struct bkey_s_c k)
++static bool interior_snapshot_needs_delete(struct bkey_s_c_snapshot snap)
+ {
+-	struct bch_fs *c = trans->c;
+-	struct bkey_s_c_snapshot snap;
+-	int ret = 0;
++	/* If there's one child, it's redundant and keys will be moved to the child */
++	return !!snap.v->children[0] + !!snap.v->children[1] == 1;
++}
+ 
++static int bch2_check_snapshot_needs_deletion(struct btree_trans *trans, struct bkey_s_c k)
++{
+ 	if (k.k->type != KEY_TYPE_snapshot)
+ 		return 0;
+ 
+-	snap = bkey_s_c_to_snapshot(k);
++	struct bkey_s_c_snapshot snap = bkey_s_c_to_snapshot(k);
+ 	if (BCH_SNAPSHOT_DELETED(snap.v) ||
+-	    bch2_snapshot_equiv(c, k.k->p.offset) != k.k->p.offset ||
+-	    (ret = bch2_snapshot_needs_delete(trans, k)) > 0) {
+-		set_bit(BCH_FS_need_delete_dead_snapshots, &c->flags);
+-		return 0;
+-	}
++	    interior_snapshot_needs_delete(snap))
++		set_bit(BCH_FS_need_delete_dead_snapshots, &trans->c->flags);
+ 
+-	return ret;
++	return 0;
+ }
+ 
+ int bch2_snapshots_read(struct bch_fs *c)
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0206-bcachefs-Kill-snapshot_t-equiv.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0206-bcachefs-Kill-snapshot_t-equiv.patch
new file mode 100644
index 0000000..d407595
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0206-bcachefs-Kill-snapshot_t-equiv.patch
@@ -0,0 +1,204 @@
+From 5d9b21a555e0df44048c16aa0b1b918883fb68c8 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 04:03:32 -0500
+Subject: [PATCH 206/233] bcachefs: Kill snapshot_t->equiv
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Now entirely dead code.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/snapshot.c        | 100 +++-------------------------------
+ fs/bcachefs/snapshot.h        |  15 -----
+ fs/bcachefs/subvolume_types.h |   1 -
+ 3 files changed, 7 insertions(+), 109 deletions(-)
+
+diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c
+index 0d60251946f1..f975f2cf3e35 100644
+--- a/fs/bcachefs/snapshot.c
++++ b/fs/bcachefs/snapshot.c
+@@ -280,23 +280,6 @@ int bch2_snapshot_validate(struct bch_fs *c, struct bkey_s_c k,
+ 	return ret;
+ }
+ 
+-static void __set_is_ancestor_bitmap(struct bch_fs *c, u32 id)
+-{
+-	struct snapshot_t *t = snapshot_t_mut(c, id);
+-	u32 parent = id;
+-
+-	while ((parent = bch2_snapshot_parent_early(c, parent)) &&
+-	       parent - id - 1 < IS_ANCESTOR_BITMAP)
+-		__set_bit(parent - id - 1, t->is_ancestor);
+-}
+-
+-static void set_is_ancestor_bitmap(struct bch_fs *c, u32 id)
+-{
+-	mutex_lock(&c->snapshot_table_lock);
+-	__set_is_ancestor_bitmap(c, id);
+-	mutex_unlock(&c->snapshot_table_lock);
+-}
+-
+ static int __bch2_mark_snapshot(struct btree_trans *trans,
+ 		       enum btree_id btree, unsigned level,
+ 		       struct bkey_s_c old, struct bkey_s_c new,
+@@ -337,7 +320,11 @@ static int __bch2_mark_snapshot(struct btree_trans *trans,
+ 			t->skip[2]	= 0;
+ 		}
+ 
+-		__set_is_ancestor_bitmap(c, id);
++		u32 parent = id;
++
++		while ((parent = bch2_snapshot_parent_early(c, parent)) &&
++		       parent - id - 1 < IS_ANCESTOR_BITMAP)
++			__set_bit(parent - id - 1, t->is_ancestor);
+ 
+ 		if (BCH_SNAPSHOT_DELETED(s.v)) {
+ 			set_bit(BCH_FS_need_delete_dead_snapshots, &c->flags);
+@@ -367,70 +354,6 @@ int bch2_snapshot_lookup(struct btree_trans *trans, u32 id,
+ 				       BTREE_ITER_with_updates, snapshot, s);
+ }
+ 
+-static int bch2_snapshot_live(struct btree_trans *trans, u32 id)
+-{
+-	struct bch_snapshot v;
+-	int ret;
+-
+-	if (!id)
+-		return 0;
+-
+-	ret = bch2_snapshot_lookup(trans, id, &v);
+-	if (bch2_err_matches(ret, ENOENT))
+-		bch_err(trans->c, "snapshot node %u not found", id);
+-	if (ret)
+-		return ret;
+-
+-	return !BCH_SNAPSHOT_DELETED(&v);
+-}
+-
+-/*
+- * If @k is a snapshot with just one live child, it's part of a linear chain,
+- * which we consider to be an equivalence class: and then after snapshot
+- * deletion cleanup, there should only be a single key at a given position in
+- * this equivalence class.
+- *
+- * This sets the equivalence class of @k to be the child's equivalence class, if
+- * it's part of such a linear chain: this correctly sets equivalence classes on
+- * startup if we run leaf to root (i.e. in natural key order).
+- */
+-static int bch2_snapshot_set_equiv(struct btree_trans *trans, struct bkey_s_c k)
+-{
+-	struct bch_fs *c = trans->c;
+-	unsigned i, nr_live = 0, live_idx = 0;
+-	struct bkey_s_c_snapshot snap;
+-	u32 id = k.k->p.offset, child[2];
+-
+-	if (k.k->type != KEY_TYPE_snapshot)
+-		return 0;
+-
+-	snap = bkey_s_c_to_snapshot(k);
+-
+-	child[0] = le32_to_cpu(snap.v->children[0]);
+-	child[1] = le32_to_cpu(snap.v->children[1]);
+-
+-	for (i = 0; i < 2; i++) {
+-		int ret = bch2_snapshot_live(trans, child[i]);
+-
+-		if (ret < 0)
+-			return ret;
+-
+-		if (ret)
+-			live_idx = i;
+-		nr_live += ret;
+-	}
+-
+-	mutex_lock(&c->snapshot_table_lock);
+-
+-	snapshot_t_mut(c, id)->equiv = nr_live == 1
+-		? snapshot_t_mut(c, child[live_idx])->equiv
+-		: id;
+-
+-	mutex_unlock(&c->snapshot_table_lock);
+-
+-	return 0;
+-}
+-
+ /* fsck: */
+ 
+ static u32 bch2_snapshot_child(struct bch_fs *c, u32 id, unsigned child)
+@@ -964,8 +887,7 @@ static int check_snapshot_exists(struct btree_trans *trans, u32 id)
+ 
+ 	return  bch2_btree_insert_trans(trans, BTREE_ID_snapshots, &snapshot->k_i, 0) ?:
+ 		bch2_mark_snapshot(trans, BTREE_ID_snapshots, 0,
+-				   bkey_s_c_null, bkey_i_to_s(&snapshot->k_i), 0) ?:
+-		bch2_snapshot_set_equiv(trans, bkey_i_to_s_c(&snapshot->k_i));
++				   bkey_s_c_null, bkey_i_to_s(&snapshot->k_i), 0);
+ }
+ 
+ /* Figure out which snapshot nodes belong in the same tree: */
+@@ -1309,10 +1231,6 @@ static int create_snapids(struct btree_trans *trans, u32 parent, u32 tree,
+ 			goto err;
+ 
+ 		new_snapids[i]	= iter.pos.offset;
+-
+-		mutex_lock(&c->snapshot_table_lock);
+-		snapshot_t_mut(c, new_snapids[i])->equiv = new_snapids[i];
+-		mutex_unlock(&c->snapshot_table_lock);
+ 	}
+ err:
+ 	bch2_trans_iter_exit(trans, &iter);
+@@ -1778,11 +1696,7 @@ int bch2_snapshots_read(struct bch_fs *c)
+ 		for_each_btree_key(trans, iter, BTREE_ID_snapshots,
+ 				   POS_MIN, 0, k,
+ 			__bch2_mark_snapshot(trans, BTREE_ID_snapshots, 0, bkey_s_c_null, k, 0) ?:
+-			bch2_snapshot_set_equiv(trans, k) ?:
+-			bch2_check_snapshot_needs_deletion(trans, k)) ?:
+-		for_each_btree_key(trans, iter, BTREE_ID_snapshots,
+-				   POS_MIN, 0, k,
+-			   (set_is_ancestor_bitmap(c, k.k->p.offset), 0)));
++			bch2_check_snapshot_needs_deletion(trans, k)));
+ 	bch_err_fn(c, ret);
+ 
+ 	/*
+diff --git a/fs/bcachefs/snapshot.h b/fs/bcachefs/snapshot.h
+index 3ff0ffa774f5..00373cf32e7b 100644
+--- a/fs/bcachefs/snapshot.h
++++ b/fs/bcachefs/snapshot.h
+@@ -134,21 +134,6 @@ static inline bool bch2_snapshot_exists(struct bch_fs *c, u32 id)
+ 	return ret;
+ }
+ 
+-static inline u32 __bch2_snapshot_equiv(struct bch_fs *c, u32 id)
+-{
+-	const struct snapshot_t *s = snapshot_t(c, id);
+-	return s ? s->equiv : 0;
+-}
+-
+-static inline u32 bch2_snapshot_equiv(struct bch_fs *c, u32 id)
+-{
+-	rcu_read_lock();
+-	id = __bch2_snapshot_equiv(c, id);
+-	rcu_read_unlock();
+-
+-	return id;
+-}
+-
+ static inline int bch2_snapshot_is_internal_node(struct bch_fs *c, u32 id)
+ {
+ 	rcu_read_lock();
+diff --git a/fs/bcachefs/subvolume_types.h b/fs/bcachefs/subvolume_types.h
+index 8a7f7e87c381..1549d6daf7af 100644
+--- a/fs/bcachefs/subvolume_types.h
++++ b/fs/bcachefs/subvolume_types.h
+@@ -16,7 +16,6 @@ struct snapshot_t {
+ 	u32			children[2];
+ 	u32			subvol; /* Nonzero only if a subvolume points to this node: */
+ 	u32			tree;
+-	u32			equiv;
+ 	unsigned long		is_ancestor[BITS_TO_LONGS(IS_ANCESTOR_BITMAP)];
+ };
+ 
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0207-bcachefs-bch2_trans_log_msg.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0207-bcachefs-bch2_trans_log_msg.patch
new file mode 100644
index 0000000..936909d
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0207-bcachefs-bch2_trans_log_msg.patch
@@ -0,0 +1,65 @@
+From 50dd5a0edf33ff18f0672a3a2ab7b285161ec1ac Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 00:44:28 -0500
+Subject: [PATCH 207/233] bcachefs: bch2_trans_log_msg()
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Export a helper for logging to the journal when we're already in a
+transaction context.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_update.c | 13 ++++++++++---
+ fs/bcachefs/btree_update.h |  1 +
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c
+index 06fd5aa62296..a4b70e3fe4c3 100644
+--- a/fs/bcachefs/btree_update.c
++++ b/fs/bcachefs/btree_update.c
+@@ -823,10 +823,17 @@ int bch2_btree_bit_mod_buffered(struct btree_trans *trans, enum btree_id btree,
+ 	return bch2_trans_update_buffered(trans, btree, &k);
+ }
+ 
+-static int __bch2_trans_log_msg(struct btree_trans *trans, struct printbuf *buf, unsigned u64s)
++int bch2_trans_log_msg(struct btree_trans *trans, struct printbuf *buf)
+ {
++	unsigned u64s = DIV_ROUND_UP(buf->pos, sizeof(u64));
++	prt_chars(buf, '\0', u64s * sizeof(u64) - buf->pos);
++
++	int ret = buf->allocation_failure ? -BCH_ERR_ENOMEM_trans_log_msg : 0;
++	if (ret)
++		return ret;
++
+ 	struct jset_entry *e = bch2_trans_jset_entry_alloc(trans, jset_u64s(u64s));
+-	int ret = PTR_ERR_OR_ZERO(e);
++	ret = PTR_ERR_OR_ZERO(e);
+ 	if (ret)
+ 		return ret;
+ 
+@@ -862,7 +869,7 @@ __bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt,
+ 		c->journal.early_journal_entries.nr += jset_u64s(u64s);
+ 	} else {
+ 		ret = bch2_trans_commit_do(c, NULL, NULL, commit_flags,
+-			__bch2_trans_log_msg(trans, &buf, u64s));
++			bch2_trans_log_msg(trans, &buf));
+ 	}
+ err:
+ 	printbuf_exit(&buf);
+diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
+index 58df20194306..8f22ef9a7651 100644
+--- a/fs/bcachefs/btree_update.h
++++ b/fs/bcachefs/btree_update.h
+@@ -159,6 +159,7 @@ void bch2_trans_commit_hook(struct btree_trans *,
+ 			    struct btree_trans_commit_hook *);
+ int __bch2_trans_commit(struct btree_trans *, unsigned);
+ 
++int bch2_trans_log_msg(struct btree_trans *, struct printbuf *);
+ __printf(2, 3) int bch2_fs_log_msg(struct bch_fs *, const char *, ...);
+ __printf(2, 3) int bch2_journal_log_msg(struct bch_fs *, const char *, ...);
+ 
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0208-bcachefs-Log-message-in-journal-for-snapshot-deletio.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0208-bcachefs-Log-message-in-journal-for-snapshot-deletio.patch
new file mode 100644
index 0000000..dd38a09
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0208-bcachefs-Log-message-in-journal-for-snapshot-deletio.patch
@@ -0,0 +1,44 @@
+From dd0d1ff378c1d32a9c2ccab19b98db720657f36d Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 04:00:40 -0500
+Subject: [PATCH 208/233] bcachefs: Log message in journal for snapshot
+ deletion
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/snapshot.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c
+index f975f2cf3e35..0dafadc1bcf2 100644
+--- a/fs/bcachefs/snapshot.c
++++ b/fs/bcachefs/snapshot.c
+@@ -1568,6 +1568,22 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
+ 	if (!delete_leaves.nr && !delete_interior.nr)
+ 		goto err;
+ 
++	{
++		struct printbuf buf = PRINTBUF;
++		prt_printf(&buf, "deleting leaves");
++		darray_for_each(delete_leaves, i)
++			prt_printf(&buf, " %u", *i);
++
++		prt_printf(&buf, " interior");
++		darray_for_each(delete_interior, i)
++			prt_printf(&buf, " %u->%u", i->id, i->live_child);
++
++		ret = commit_do(trans, NULL, NULL, 0, bch2_trans_log_msg(trans, &buf));
++		printbuf_exit(&buf);
++		if (ret)
++			goto err;
++	}
++
+ 	for (unsigned btree = 0; btree < BTREE_ID_NR; btree++) {
+ 		struct disk_reservation res = { 0 };
+ 
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0209-bcachefs-trace_key_cache_fill.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0209-bcachefs-trace_key_cache_fill.patch
new file mode 100644
index 0000000..55f3011
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0209-bcachefs-trace_key_cache_fill.patch
@@ -0,0 +1,90 @@
+From 0694b43ff91f13b81474ff335b00b560dcb94ea9 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Fri, 13 Dec 2024 05:43:00 -0500
+Subject: [PATCH 209/233] bcachefs: trace_key_cache_fill
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_key_cache.c | 10 ++++++++++
+ fs/bcachefs/trace.h           | 27 ++++++++++++++++++++++-----
+ 2 files changed, 32 insertions(+), 5 deletions(-)
+
+diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c
+index 3bd40ea0fa3d..4eba2871f289 100644
+--- a/fs/bcachefs/btree_key_cache.c
++++ b/fs/bcachefs/btree_key_cache.c
+@@ -309,6 +309,16 @@ static noinline int btree_key_cache_fill(struct btree_trans *trans,
+ 	ret = btree_key_cache_create(trans, ck_path, k);
+ 	if (ret)
+ 		goto err;
++
++	if (trace_key_cache_fill_enabled()) {
++		struct printbuf buf = PRINTBUF;
++
++		bch2_bpos_to_text(&buf, ck_path->pos);
++		prt_char(&buf, ' ');
++		bch2_bkey_val_to_text(&buf, trans->c, k);
++		trace_key_cache_fill(trans, buf.buf);
++		printbuf_exit(&buf);
++	}
+ out:
+ 	/* We're not likely to need this iterator again: */
+ 	bch2_set_btree_iter_dontneed(&iter);
+diff --git a/fs/bcachefs/trace.h b/fs/bcachefs/trace.h
+index 11e6547f91d6..9d40b7d4ea29 100644
+--- a/fs/bcachefs/trace.h
++++ b/fs/bcachefs/trace.h
+@@ -1338,6 +1338,12 @@ TRACE_EVENT(trans_restart_key_cache_key_realloced,
+ 		  __entry->new_u64s)
+ );
+ 
++DEFINE_EVENT(transaction_event,	trans_restart_write_buffer_flush,
++	TP_PROTO(struct btree_trans *trans,
++		 unsigned long caller_ip),
++	TP_ARGS(trans, caller_ip)
++);
++
+ TRACE_EVENT(path_downgrade,
+ 	TP_PROTO(struct btree_trans *trans,
+ 		 unsigned long caller_ip,
+@@ -1374,10 +1380,21 @@ TRACE_EVENT(path_downgrade,
+ 		  __entry->pos_snapshot)
+ );
+ 
+-DEFINE_EVENT(transaction_event,	trans_restart_write_buffer_flush,
+-	TP_PROTO(struct btree_trans *trans,
+-		 unsigned long caller_ip),
+-	TP_ARGS(trans, caller_ip)
++TRACE_EVENT(key_cache_fill,
++	TP_PROTO(struct btree_trans *trans, const char *key),
++	TP_ARGS(trans, key),
++
++	TP_STRUCT__entry(
++		__array(char,		trans_fn, 32	)
++		__string(key,		key			)
++	),
++
++	TP_fast_assign(
++		strscpy(__entry->trans_fn, trans->fn, sizeof(__entry->trans_fn));
++		__assign_str(key);
++	),
++
++	TP_printk("%s %s", __entry->trans_fn, __get_str(key))
+ );
+ 
+ TRACE_EVENT(write_buffer_flush,
+@@ -1443,7 +1460,7 @@ TRACE_EVENT(write_buffer_maybe_flush,
+ 	TP_STRUCT__entry(
+ 		__array(char,			trans_fn, 32	)
+ 		__field(unsigned long,		caller_ip	)
+-		__string(key,		key			)
++		__string(key,			key		)
+ 	),
+ 
+ 	TP_fast_assign(
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0210-bcachefs-bch2_btree_path_peek_slot-doesn-t-return-er.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0210-bcachefs-bch2_btree_path_peek_slot-doesn-t-return-er.patch
new file mode 100644
index 0000000..0a7dc89
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0210-bcachefs-bch2_btree_path_peek_slot-doesn-t-return-er.patch
@@ -0,0 +1,44 @@
+From 8062b348614c13b0be9ec57fc78effa59318baf9 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Fri, 13 Dec 2024 05:58:34 -0500
+Subject: [PATCH 210/233] bcachefs: bch2_btree_path_peek_slot() doesn't return
+ errors
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_iter.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
+index b27944b62087..a1c5fcced24e 100644
+--- a/fs/bcachefs/btree_iter.c
++++ b/fs/bcachefs/btree_iter.c
+@@ -2229,14 +2229,15 @@ struct bkey_s_c btree_trans_peek_key_cache(struct btree_iter *iter, struct bpos
+ 	btree_path_set_should_be_locked(trans, trans->paths + iter->key_cache_path);
+ 
+ 	k = bch2_btree_path_peek_slot(trans->paths + iter->key_cache_path, &u);
+-	if (k.k && !bkey_err(k)) {
+-		if ((iter->flags & BTREE_ITER_all_snapshots) &&
+-		    !bpos_eq(pos, k.k->p))
+-			return bkey_s_c_null;
++	if (!k.k)
++		return k;
+ 
+-		iter->k = u;
+-		k.k = &iter->k;
+-	}
++	if ((iter->flags & BTREE_ITER_all_snapshots) &&
++	    !bpos_eq(pos, k.k->p))
++		return bkey_s_c_null;
++
++	iter->k = u;
++	k.k = &iter->k;
+ 	return k;
+ }
+ 
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0198-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0211-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0198-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0211-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch
index 31e9714..149db97 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0198-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0211-bcachefs-bcachefs_metadata_version_backpointer_bucke.patch
@@ -1,7 +1,7 @@
-From 5dab1de8110565dc63d1e3063df87a621b147b4a Mon Sep 17 00:00:00 2001
+From ab7eb8e365936471733a4ea529818354132e4bd2 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sat, 16 Nov 2024 23:53:07 -0500
-Subject: [PATCH 198/213] bcachefs:
+Subject: [PATCH 211/233] bcachefs:
  bcachefs_metadata_version_backpointer_bucket_gen
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0199-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0212-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0199-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0212-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch
index 9df45f6..8e30d73 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0199-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0212-bcachefs-bcachefs_metadata_version_disk_accounting_b.patch
@@ -1,7 +1,7 @@
-From 99ae6eea55fe7c4c4fd23b2437416e2f926d55c6 Mon Sep 17 00:00:00 2001
+From c6b74e6733a136501032c13c3d762f8896b0cd24 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 29 Nov 2024 17:41:43 -0500
-Subject: [PATCH 199/213] bcachefs:
+Subject: [PATCH 212/233] bcachefs:
  bcachefs_metadata_version_disk_accounting_big_endian
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0200-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0213-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch
similarity index 94%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0200-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0213-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch
index e15bcb9..a452662 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0200-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0213-bcachefs-bch2_extent_ptr_to_bp-no-longer-depends-on-.patch
@@ -1,7 +1,7 @@
-From ab9acb6daf0ce12fdef3d82f87a7a930ca26ac84 Mon Sep 17 00:00:00 2001
+From 70e1e1af77787dbbfc559cdab323c44f7bc68ba5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 17 Nov 2024 23:58:21 -0500
-Subject: [PATCH 200/213] bcachefs: bch2_extent_ptr_to_bp() no longer depends
+Subject: [PATCH 213/233] bcachefs: bch2_extent_ptr_to_bp() no longer depends
  on device
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
@@ -124,10 +124,10 @@ index caffc68407ab..d126d40dda99 100644
  
  struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *, struct bkey_s_c_backpointer,
 diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
-index eb2ed4edbbbc..32d95ff4823c 100644
+index bbd37b1ed5d2..30b983cf9780 100644
 --- a/fs/bcachefs/buckets.c
 +++ b/fs/bcachefs/buckets.c
-@@ -571,6 +571,9 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
+@@ -572,6 +572,9 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
  	u64 abs_sectors = ptr_disk_sectors(level ? btree_sectors(c) : k.k->size, p);
  	*sectors = insert ? abs_sectors : -abs_sectors;
  
@@ -137,7 +137,7 @@ index eb2ed4edbbbc..32d95ff4823c 100644
  	struct bch_dev *ca = bch2_dev_tryget(c, p.ptr.dev);
  	if (unlikely(!ca)) {
  		if (insert && p.ptr.dev != BCH_SB_MEMBER_INVALID)
-@@ -578,9 +581,7 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
+@@ -579,9 +582,7 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
  		goto err;
  	}
  
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0201-bcachefs-kill-__bch2_extent_ptr_to_bp.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0214-bcachefs-kill-__bch2_extent_ptr_to_bp.patch
similarity index 92%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0201-bcachefs-kill-__bch2_extent_ptr_to_bp.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0214-bcachefs-kill-__bch2_extent_ptr_to_bp.patch
index a23e387..c18866c 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0201-bcachefs-kill-__bch2_extent_ptr_to_bp.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0214-bcachefs-kill-__bch2_extent_ptr_to_bp.patch
@@ -1,7 +1,7 @@
-From ba652c3bafe3b940bcd5d67f08f3ba189bde3173 Mon Sep 17 00:00:00 2001
+From 78daf5eaab64b6d7adda12932102d22ea37f75e5 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 17 Nov 2024 18:37:41 -0500
-Subject: [PATCH 201/213] bcachefs: kill __bch2_extent_ptr_to_bp()
+Subject: [PATCH 214/233] bcachefs: kill __bch2_extent_ptr_to_bp()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
@@ -56,10 +56,10 @@ index d126d40dda99..65ede8adbc36 100644
  					 struct btree_iter *, unsigned);
  struct btree *bch2_backpointer_get_node(struct btree_trans *, struct bkey_s_c_backpointer,
 diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
-index 32d95ff4823c..7da6ee4ef7b0 100644
+index 30b983cf9780..56d3e3800a89 100644
 --- a/fs/bcachefs/buckets.c
 +++ b/fs/bcachefs/buckets.c
-@@ -568,11 +568,10 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
+@@ -569,11 +569,10 @@ static int bch2_trigger_pointer(struct btree_trans *trans,
  	struct printbuf buf = PRINTBUF;
  	int ret = 0;
  
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0202-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0215-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0202-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0215-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch
index 7daaa50..4ed8f9b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0202-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0215-bcachefs-Add-write-buffer-flush-param-to-backpointer.patch
@@ -1,7 +1,7 @@
-From 8cd36001f4b0e0b5db0e9edde60028c348b75338 Mon Sep 17 00:00:00 2001
+From 9364e11cb32472226fe34188bc443ae38ec2963d Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 14 Nov 2024 22:13:29 -0500
-Subject: [PATCH 202/213] bcachefs: Add write buffer flush param to
+Subject: [PATCH 215/233] bcachefs: Add write buffer flush param to
  backpointer_get_key()
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0203-bcachefs-check_extents_to_backpointers-now-only-chec.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0216-bcachefs-check_extents_to_backpointers-now-only-chec.patch
similarity index 99%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0203-bcachefs-check_extents_to_backpointers-now-only-chec.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0216-bcachefs-check_extents_to_backpointers-now-only-chec.patch
index 526d5da..8a93c30 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0203-bcachefs-check_extents_to_backpointers-now-only-chec.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0216-bcachefs-check_extents_to_backpointers-now-only-chec.patch
@@ -1,7 +1,7 @@
-From 470b90052a49b2a4982d221ee4b4c7d36c6363e1 Mon Sep 17 00:00:00 2001
+From cbe8afdbcda6994f7fec5d0d019c7c30c4c18d75 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Fri, 15 Nov 2024 16:31:54 -0500
-Subject: [PATCH 203/213] bcachefs: check_extents_to_backpointers() now only
+Subject: [PATCH 216/233] bcachefs: check_extents_to_backpointers() now only
  checks buckets with mismatches
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0204-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0217-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0204-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0217-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch
index 282d98d..7c6e1f6 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0204-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0217-bcachefs-bch2_backpointer_get_key-now-repairs-dangli.patch
@@ -1,7 +1,7 @@
-From 8c1bae2234b9c39a2a03733ae3d5d5bee7b10b75 Mon Sep 17 00:00:00 2001
+From 19b148fc65a3eb2d583738f9f4390400c80f2419 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 12 Nov 2024 03:46:31 -0500
-Subject: [PATCH 204/213] bcachefs: bch2_backpointer_get_key() now repairs
+Subject: [PATCH 217/233] bcachefs: bch2_backpointer_get_key() now repairs
  dangling backpointers
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0205-bcachefs-better-backpointer_target_not_found-error-m.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0218-bcachefs-better-backpointer_target_not_found-error-m.patch
similarity index 92%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0205-bcachefs-better-backpointer_target_not_found-error-m.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0218-bcachefs-better-backpointer_target_not_found-error-m.patch
index da2abf2..057f54f 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0205-bcachefs-better-backpointer_target_not_found-error-m.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0218-bcachefs-better-backpointer_target_not_found-error-m.patch
@@ -1,7 +1,7 @@
-From a81618382c36ca52f5076cb51897699f3e196ae3 Mon Sep 17 00:00:00 2001
+From ae7a39471902965e7b18dcc675e1741d9c7e9a95 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 10 Dec 2024 14:04:39 -0500
-Subject: [PATCH 205/213] bcachefs: better backpointer_target_not_found() error
+Subject: [PATCH 218/233] bcachefs: better backpointer_target_not_found() error
  message
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0206-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0219-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0206-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0219-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch
index a7c3621..3f96b1b 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0206-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0219-bcachefs-Only-run-check_backpointers_to_extents-in-d.patch
@@ -1,7 +1,7 @@
-From 8db0793d8d1677e8b8d90677fe8bf9b32170c7f9 Mon Sep 17 00:00:00 2001
+From a33c661174e055fb13192e13fd70a6a2eb047e49 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Thu, 14 Nov 2024 20:47:32 -0500
-Subject: [PATCH 206/213] bcachefs: Only run check_backpointers_to_extents in
+Subject: [PATCH 219/233] bcachefs: Only run check_backpointers_to_extents in
  debug mode
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0207-bcachefs-BCH_SB_VERSION_INCOMPAT.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0220-bcachefs-BCH_SB_VERSION_INCOMPAT.patch
similarity index 99%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0207-bcachefs-BCH_SB_VERSION_INCOMPAT.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0220-bcachefs-BCH_SB_VERSION_INCOMPAT.patch
index f80b30e..5f6e1f2 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0207-bcachefs-BCH_SB_VERSION_INCOMPAT.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0220-bcachefs-BCH_SB_VERSION_INCOMPAT.patch
@@ -1,7 +1,7 @@
-From a4b7710fcd169dc87dbb219a2be9a2209fdcc7e3 Mon Sep 17 00:00:00 2001
+From a06f09e44c8c4e82680b58ed6c7c8048283a0466 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Mon, 11 Nov 2024 21:50:29 -0500
-Subject: [PATCH 207/213] bcachefs: BCH_SB_VERSION_INCOMPAT
+Subject: [PATCH 220/233] bcachefs: BCH_SB_VERSION_INCOMPAT
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0208-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0221-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0208-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0221-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch
index 63b8d7f..4b186c7 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0208-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0221-bcachefs-bcachefs_metadata_version_reflink_p_may_upd.patch
@@ -1,7 +1,7 @@
-From 5dc97347fac9020194fef674cfaf6bafbbb7b26a Mon Sep 17 00:00:00 2001
+From 710fb4e0abfff57d297a14f08abb64ab56a2cfe1 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 6 Nov 2024 23:16:24 -0500
-Subject: [PATCH 208/213] bcachefs:
+Subject: [PATCH 221/233] bcachefs:
  bcachefs_metadata_version_reflink_p_may_update_opts
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0209-bcachefs-Option-changes-now-get-propagated-to-reflin.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0222-bcachefs-Option-changes-now-get-propagated-to-reflin.patch
similarity index 97%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0209-bcachefs-Option-changes-now-get-propagated-to-reflin.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0222-bcachefs-Option-changes-now-get-propagated-to-reflin.patch
index 770dd35..7cced59 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0209-bcachefs-Option-changes-now-get-propagated-to-reflin.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0222-bcachefs-Option-changes-now-get-propagated-to-reflin.patch
@@ -1,7 +1,7 @@
-From d23b86175eded71da5adb30c7e30fccaff1a5d31 Mon Sep 17 00:00:00 2001
+From 7fa06b998c9143dbfc64150d4297f740ad9f250c Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 20 Oct 2024 02:12:21 -0400
-Subject: [PATCH 209/213] bcachefs: Option changes now get propagated to
+Subject: [PATCH 222/233] bcachefs: Option changes now get propagated to
  reflinked data
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0210-bcachefs-bcachefs_metadata_version_inode_depth.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0223-bcachefs-bcachefs_metadata_version_inode_depth.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0210-bcachefs-bcachefs_metadata_version_inode_depth.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0223-bcachefs-bcachefs_metadata_version_inode_depth.patch
index e0a0b1b..9def2ef 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0210-bcachefs-bcachefs_metadata_version_inode_depth.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0223-bcachefs-bcachefs_metadata_version_inode_depth.patch
@@ -1,7 +1,7 @@
-From f07822032bc90f93bece9934d397ffba4b01f9ac Mon Sep 17 00:00:00 2001
+From b4f1b7e26ce16f9fc85d1f6f9ff96242b3e053b4 Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Wed, 2 Aug 2023 20:27:38 -0400
-Subject: [PATCH 210/213] bcachefs: bcachefs_metadata_version_inode_depth
+Subject: [PATCH 223/233] bcachefs: bcachefs_metadata_version_inode_depth
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0211-bcachefs-bcachefs_metadata_version_persistent_inode_.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0224-bcachefs-bcachefs_metadata_version_persistent_inode_.patch
similarity index 85%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0211-bcachefs-bcachefs_metadata_version_persistent_inode_.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0224-bcachefs-bcachefs_metadata_version_persistent_inode_.patch
index 098e7bc..69f7698 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0211-bcachefs-bcachefs_metadata_version_persistent_inode_.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0224-bcachefs-bcachefs_metadata_version_persistent_inode_.patch
@@ -1,7 +1,7 @@
-From df245c0a33fa3c6c51a09584dae6854338e44c34 Mon Sep 17 00:00:00 2001
+From 7dbe48b9636827e97961a904f10e6f0ae1129b4f Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Sun, 1 Dec 2024 21:44:38 -0500
-Subject: [PATCH 211/213] bcachefs:
+Subject: [PATCH 224/233] bcachefs:
  bcachefs_metadata_version_persistent_inode_cursors
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
@@ -21,16 +21,17 @@ Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
  fs/bcachefs/bcachefs.h          |   3 -
  fs/bcachefs/bcachefs_format.h   |  10 ++-
  fs/bcachefs/btree_update.c      |   2 +-
- fs/bcachefs/inode.c             | 121 +++++++++++++++++++++++---------
+ fs/bcachefs/inode.c             | 120 ++++++++++++++++++++++----------
  fs/bcachefs/inode.h             |  10 +++
- fs/bcachefs/inode_format.h      |   8 +++
+ fs/bcachefs/inode_format.h      |  14 +++-
+ fs/bcachefs/journal_io.c        |   4 +-
  fs/bcachefs/logged_ops.c        |   5 +-
  fs/bcachefs/logged_ops_format.h |   5 +-
- fs/bcachefs/opts.h              |   9 ++-
+ fs/bcachefs/opts.h              |  10 +--
  fs/bcachefs/sb-errors_format.h  |   3 +-
  fs/bcachefs/super-io.c          |   5 ++
  fs/bcachefs/super.c             |   7 +-
- 12 files changed, 135 insertions(+), 53 deletions(-)
+ 13 files changed, 138 insertions(+), 60 deletions(-)
 
 diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
 index b749c4ecad1b..161cf2f05d2a 100644
@@ -89,7 +90,7 @@ index f140c3366e65..09e53bef1a30 100644
  	  BIT_ULL(KEY_TYPE_set)|BIT_ULL(KEY_TYPE_cookie))			\
  	x(subvolume_children,	19,	0,					\
 diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c
-index 06fd5aa62296..b1da6dba8bf4 100644
+index a4b70e3fe4c3..13d794f201a5 100644
 --- a/fs/bcachefs/btree_update.c
 +++ b/fs/bcachefs/btree_update.c
 @@ -588,7 +588,7 @@ struct jset_entry *__bch2_trans_jset_entry_alloc(struct btree_trans *trans, unsi
@@ -102,7 +103,7 @@ index 06fd5aa62296..b1da6dba8bf4 100644
  	int ret = bkey_err(k);
  	if (ret)
 diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c
-index f6245b78eb78..baa5c9144a1c 100644
+index f6245b78eb78..04ec05206f8c 100644
 --- a/fs/bcachefs/inode.c
 +++ b/fs/bcachefs/inode.c
 @@ -799,6 +799,28 @@ void bch2_inode_generation_to_text(struct printbuf *out, struct bch_fs *c,
@@ -134,7 +135,7 @@ index f6245b78eb78..baa5c9144a1c 100644
  void bch2_inode_init_early(struct bch_fs *c,
  			   struct bch_inode_unpacked *inode_u)
  {
-@@ -859,43 +881,81 @@ static inline u32 bkey_generation(struct bkey_s_c k)
+@@ -859,43 +881,78 @@ static inline u32 bkey_generation(struct bkey_s_c k)
  	}
  }
  
@@ -154,10 +155,14 @@ index f6245b78eb78..baa5c9144a1c 100644
 -	int ret = 0;
 -	unsigned bits = (c->opts.inodes_32bit ? 31 : 63);
  
-+	u64 cursor_idx = c->opts.shard_inode_numbers ? cpu : 0;
+-	if (c->opts.shard_inode_numbers) {
+-		bits -= c->inode_shard_bits;
++	u64 cursor_idx = c->opts.inodes_32bit ? 0 : cpu + 1;
 +
 +	cursor_idx &= ~(~0ULL << c->opts.shard_inode_numbers_bits);
-+
+ 
+-		min = (cpu << bits);
+-		max = (cpu << bits) | ~(ULLONG_MAX << bits);
 +	struct btree_iter iter;
 +	struct bkey_s_c k = bch2_bkey_get_iter(trans, &iter,
 +					BTREE_ID_logged_ops,
@@ -174,28 +179,22 @@ index f6245b78eb78..baa5c9144a1c 100644
 +	ret = PTR_ERR_OR_ZERO(cursor);
 +	if (ret)
 +		goto err;
-+
-+	cursor->v.bits = c->opts.shard_inode_numbers_bits;
-+
-+	unsigned bits = (c->opts.inodes_32bit ? 31 : 63);
- 	if (c->opts.shard_inode_numbers) {
--		bits -= c->inode_shard_bits;
-+		bits -= cursor->v.bits;
- 
--		min = (cpu << bits);
--		max = (cpu << bits) | ~(ULLONG_MAX << bits);
-+		*min = (cpu << bits);
-+		*max = (cpu << bits) | ~(ULLONG_MAX << bits);
  
 -		min = max_t(u64, min, BLOCKDEV_INODE_MAX);
 -		hint = c->unused_inode_hints + cpu;
-+		*min = max_t(u64, *min, BLOCKDEV_INODE_MAX);
++	if (c->opts.inodes_32bit) {
++		*min = BLOCKDEV_INODE_MAX;
++		*max = INT_MAX;
  	} else {
 -		min = BLOCKDEV_INODE_MAX;
 -		max = ~(ULLONG_MAX << bits);
 -		hint = c->unused_inode_hints;
-+		*min = BLOCKDEV_INODE_MAX;
-+		*max = ~(ULLONG_MAX << bits);
++		cursor->v.bits = c->opts.shard_inode_numbers_bits;
++
++		unsigned bits = 63 - c->opts.shard_inode_numbers_bits;
++
++		*min = max(cpu << bits, (u64) INT_MAX + 1);
++		*max = (cpu << bits) | ~(ULLONG_MAX << bits);
  	}
  
 -	start = READ_ONCE(*hint);
@@ -239,7 +238,7 @@ index f6245b78eb78..baa5c9144a1c 100644
  again:
  	while ((k = bch2_btree_iter_peek(iter)).k &&
  	       !(ret = bkey_err(k)) &&
-@@ -925,6 +985,7 @@ int bch2_inode_create(struct btree_trans *trans,
+@@ -925,6 +982,7 @@ int bch2_inode_create(struct btree_trans *trans,
  	/* Retry from start */
  	pos = start = min;
  	bch2_btree_iter_set_pos(iter, POS(0, pos));
@@ -247,7 +246,7 @@ index f6245b78eb78..baa5c9144a1c 100644
  	goto again;
  found_slot:
  	bch2_btree_iter_set_pos(iter, SPOS(0, pos, snapshot));
-@@ -935,9 +996,9 @@ int bch2_inode_create(struct btree_trans *trans,
+@@ -935,9 +993,9 @@ int bch2_inode_create(struct btree_trans *trans,
  		return ret;
  	}
  
@@ -259,7 +258,7 @@ index f6245b78eb78..baa5c9144a1c 100644
  	return 0;
  }
  
-@@ -999,8 +1060,6 @@ int bch2_inode_rm(struct bch_fs *c, subvol_inum inum)
+@@ -999,8 +1057,6 @@ int bch2_inode_rm(struct bch_fs *c, subvol_inum inum)
  {
  	struct btree_trans *trans = bch2_trans_get(c);
  	struct btree_iter iter = { NULL };
@@ -268,7 +267,7 @@ index f6245b78eb78..baa5c9144a1c 100644
  	struct bkey_s_c k;
  	u32 snapshot;
  	int ret;
-@@ -1040,13 +1099,7 @@ int bch2_inode_rm(struct bch_fs *c, subvol_inum inum)
+@@ -1040,13 +1096,7 @@ int bch2_inode_rm(struct bch_fs *c, subvol_inum inum)
  		goto err;
  	}
  
@@ -305,10 +304,30 @@ index 5bca6950f20e..d2e134528f0e 100644
  typedef struct {
  	u64			lo;
 diff --git a/fs/bcachefs/inode_format.h b/fs/bcachefs/inode_format.h
-index be1e747629d2..1b93e189b745 100644
+index be1e747629d2..b99a5bf1a75e 100644
 --- a/fs/bcachefs/inode_format.h
 +++ b/fs/bcachefs/inode_format.h
-@@ -165,4 +165,12 @@ LE64_BITMASK(INODEv3_FIELDS_START,
+@@ -102,7 +102,8 @@ struct bch_inode_generation {
+ 	x(bi_subvol,			32)	\
+ 	x(bi_parent_subvol,		32)	\
+ 	x(bi_nocow,			8)	\
+-	x(bi_depth,			32)
++	x(bi_depth,			32)	\
++	x(bi_inodes_32bit,		8)
+ 
+ /* subset of BCH_INODE_FIELDS */
+ #define BCH_INODE_OPTS()			\
+@@ -115,7 +116,8 @@ struct bch_inode_generation {
+ 	x(foreground_target,		16)	\
+ 	x(background_target,		16)	\
+ 	x(erasure_code,			16)	\
+-	x(nocow,			8)
++	x(nocow,			8)	\
++	x(inodes_32bit,			8)
+ 
+ enum inode_opt_id {
+ #define x(name, ...)				\
+@@ -165,4 +167,12 @@ LE64_BITMASK(INODEv3_FIELDS_START,
  				struct bch_inode_v3, bi_flags, 31, 36);
  LE64_BITMASK(INODEv3_MODE,	struct bch_inode_v3, bi_flags, 36, 52);
  
@@ -321,6 +340,22 @@ index be1e747629d2..1b93e189b745 100644
 +};
 +
  #endif /* _BCACHEFS_INODE_FORMAT_H */
+diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
+index 7f2efe85a805..e1773ac27824 100644
+--- a/fs/bcachefs/journal_io.c
++++ b/fs/bcachefs/journal_io.c
+@@ -1114,8 +1114,10 @@ static int journal_read_bucket(struct bch_dev *ca,
+ 				       (printbuf_reset(&err),
+ 					prt_str(&err, "journal "),
+ 					bch2_csum_err_msg(&err, csum_type, j->csum, csum),
+-					err.buf)))
++					err.buf))) {
+ 			saw_bad = true;
++			bch2_fatal_error(c);
++		}
+ 
+ 		ret = bch2_encrypt(c, JSET_CSUM_TYPE(j), journal_nonce(j),
+ 			     j->encrypted_start,
 diff --git a/fs/bcachefs/logged_ops.c b/fs/bcachefs/logged_ops.c
 index 1ac51af16299..75f27ec26f85 100644
 --- a/fs/bcachefs/logged_ops.c
@@ -361,32 +396,29 @@ index 0b370a963ac6..cfb67c95d4c8 100644
  struct bch_logged_op_truncate {
  	struct bch_val		v;
 diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h
-index ea69099e681d..2df5c8f7d0b4 100644
+index ea69099e681d..e763d52e0f38 100644
 --- a/fs/bcachefs/opts.h
 +++ b/fs/bcachefs/opts.h
-@@ -222,15 +222,20 @@ enum fsck_err_opts {
+@@ -222,14 +222,14 @@ enum fsck_err_opts {
  	  BCH_SB_ERASURE_CODE,		false,				\
  	  NULL,		"Enable erasure coding (DO NOT USE YET)")	\
  	x(inodes_32bit,			u8,				\
 -	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\
-+	  OPT_FS|OPT_FORMAT,						\
++	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\
  	  OPT_BOOL(),							\
  	  BCH_SB_INODE_32BIT,		true,				\
  	  NULL,		"Constrain inode numbers to 32 bits")		\
- 	x(shard_inode_numbers,		u8,				\
+-	x(shard_inode_numbers,		u8,				\
 -	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\
-+	  OPT_FS|OPT_FORMAT,						\
- 	  OPT_BOOL(),							\
- 	  BCH_SB_SHARD_INUMS,		true,				\
- 	  NULL,		"Shard new inode numbers by CPU id")		\
+-	  OPT_BOOL(),							\
+-	  BCH_SB_SHARD_INUMS,		true,				\
 +	x(shard_inode_numbers_bits,	u8,				\
 +	  OPT_FS|OPT_FORMAT,						\
 +	  OPT_UINT(0, 8),						\
 +	  BCH_SB_SHARD_INUMS_NBITS,	0,				\
-+	  NULL,		"Shard new inode numbers by CPU id")		\
+ 	  NULL,		"Shard new inode numbers by CPU id")		\
  	x(inodes_use_key_cache,	u8,					\
  	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\
- 	  OPT_BOOL(),							\
 diff --git a/fs/bcachefs/sb-errors_format.h b/fs/bcachefs/sb-errors_format.h
 index 806486635075..e26317c367f7 100644
 --- a/fs/bcachefs/sb-errors_format.h
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0212-bcachefs-bcachefs_metadata_version_autofix_errors.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0225-bcachefs-bcachefs_metadata_version_autofix_errors.patch
similarity index 93%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0212-bcachefs-bcachefs_metadata_version_autofix_errors.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0225-bcachefs-bcachefs_metadata_version_autofix_errors.patch
index 88be911..60e71aa 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0212-bcachefs-bcachefs_metadata_version_autofix_errors.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0225-bcachefs-bcachefs_metadata_version_autofix_errors.patch
@@ -1,7 +1,7 @@
-From a5477fe1427526a511bb3e72b82cae6b065cbfc6 Mon Sep 17 00:00:00 2001
+From 10e485bba03a3f473cb91ba9fe23979631f34f8a Mon Sep 17 00:00:00 2001
 From: Kent Overstreet <kent.overstreet@linux.dev>
 Date: Tue, 10 Dec 2024 14:19:30 -0500
-Subject: [PATCH 212/213] bcachefs: bcachefs_metadata_version_autofix_errors
+Subject: [PATCH 225/233] bcachefs: bcachefs_metadata_version_autofix_errors
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0213-bcachefs-add-counter_flags-for-counters.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0226-bcachefs-add-counter_flags-for-counters.patch
similarity index 98%
rename from sys-kernel/hardened-kernel/files/linux-6.12/0213-bcachefs-add-counter_flags-for-counters.patch
rename to sys-kernel/hardened-kernel/files/linux-6.12/0226-bcachefs-add-counter_flags-for-counters.patch
index a8b40a7..b471904 100644
--- a/sys-kernel/hardened-kernel/files/linux-6.12/0213-bcachefs-add-counter_flags-for-counters.patch
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0226-bcachefs-add-counter_flags-for-counters.patch
@@ -1,7 +1,7 @@
-From f8ed2074989f3627f1de33a33aa65d289cc03190 Mon Sep 17 00:00:00 2001
+From 92b9e40732257b619052ef57d6cba9a7d071eb38 Mon Sep 17 00:00:00 2001
 From: Hongbo Li <lihongbo22@huawei.com>
 Date: Tue, 12 Nov 2024 16:15:47 +0800
-Subject: [PATCH 213/213] bcachefs: add counter_flags for counters
+Subject: [PATCH 226/233] bcachefs: add counter_flags for counters
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0227-bcachefs-better-check_bp_exists-error-message.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0227-bcachefs-better-check_bp_exists-error-message.patch
new file mode 100644
index 0000000..331c097
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0227-bcachefs-better-check_bp_exists-error-message.patch
@@ -0,0 +1,36 @@
+From 959dbb09ed74b73d67fdb3f375fe5de40b839ba4 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Thu, 12 Dec 2024 00:55:48 -0500
+Subject: [PATCH 227/233] bcachefs: better check_bp_exists() error message
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/backpointers.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/fs/bcachefs/backpointers.c b/fs/bcachefs/backpointers.c
+index b93ddfa00fdd..ebeb6a5ff9d2 100644
+--- a/fs/bcachefs/backpointers.c
++++ b/fs/bcachefs/backpointers.c
+@@ -566,11 +566,11 @@ static int check_bp_exists(struct btree_trans *trans,
+ 	goto err;
+ missing:
+ 	printbuf_reset(&buf);
+-	prt_str(&buf, "missing backpointer ");
+-	bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&bp->k_i));
+-	prt_newline(&buf);
++	prt_str(&buf, "missing backpointer\n  for:  ");
+ 	bch2_bkey_val_to_text(&buf, c, orig_k);
+-	prt_printf(&buf, "\n  got:   ");
++	prt_printf(&buf, "\n  want: ");
++	bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&bp->k_i));
++	prt_printf(&buf, "\n  got:  ");
+ 	bch2_bkey_val_to_text(&buf, c, bp_k);
+ 
+ 	if (fsck_err(trans, ptr_to_missing_backpointer, "%s", buf.buf))
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0228-bcachefs-Drop-racy-warning.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0228-bcachefs-Drop-racy-warning.patch
new file mode 100644
index 0000000..0364544
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0228-bcachefs-Drop-racy-warning.patch
@@ -0,0 +1,39 @@
+From 52084849f3d623be3897d085f58d62c773b2e33e Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Sun, 15 Dec 2024 01:52:54 -0500
+Subject: [PATCH 228/233] bcachefs: Drop racy warning
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Checking for writing past i_size after unlocking the folio and clearing
+the dirty bit is racy, and we already check it at the start.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/fs-io-buffered.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/fs/bcachefs/fs-io-buffered.c b/fs/bcachefs/fs-io-buffered.c
+index ff8b8df50bf3..ab1d5db2fa56 100644
+--- a/fs/bcachefs/fs-io-buffered.c
++++ b/fs/bcachefs/fs-io-buffered.c
+@@ -625,15 +625,6 @@ static int __bch2_writepage(struct folio *folio,
+ 		BUG_ON(!bio_add_folio(&w->io->op.wbio.bio, folio,
+ 				     sectors << 9, offset << 9));
+ 
+-		/* Check for writing past i_size: */
+-		WARN_ONCE((bio_end_sector(&w->io->op.wbio.bio) << 9) >
+-			  round_up(i_size, block_bytes(c)) &&
+-			  !test_bit(BCH_FS_emergency_ro, &c->flags),
+-			  "writing past i_size: %llu > %llu (unrounded %llu)\n",
+-			  bio_end_sector(&w->io->op.wbio.bio) << 9,
+-			  round_up(i_size, block_bytes(c)),
+-			  i_size);
+-
+ 		w->io->op.res.sectors += reserved_sectors;
+ 		w->io->op.i_sectors_delta -= dirty_sectors;
+ 		w->io->op.new_i_size = i_size;
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0229-bcachefs-Drop-redundant-read-error-call-from-btree_g.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0229-bcachefs-Drop-redundant-read-error-call-from-btree_g.patch
new file mode 100644
index 0000000..b5e440a
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0229-bcachefs-Drop-redundant-read-error-call-from-btree_g.patch
@@ -0,0 +1,43 @@
+From 83fa58a3704b538c240b1ae6e8e91ff08eb88269 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Sun, 15 Dec 2024 02:03:11 -0500
+Subject: [PATCH 229/233] bcachefs: Drop redundant "read error" call from
+ btree_gc
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+The btree node read error path already calls topology error, so this is
+entirely redundant, and we're not specific enough about our error codes
+- this was triggering for bucket_ref_update() errors.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_gc.c | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
+index 5aa11ca08c94..721dca551720 100644
+--- a/fs/bcachefs/btree_gc.c
++++ b/fs/bcachefs/btree_gc.c
+@@ -733,16 +733,8 @@ static int bch2_gc_btrees(struct bch_fs *c)
+ 			continue;
+ 
+ 		ret = bch2_gc_btree(trans, btree, true);
+-
+-		if (mustfix_fsck_err_on(bch2_err_matches(ret, EIO),
+-					trans, btree_node_read_error,
+-			       "btree node read error for %s",
+-			       (printbuf_reset(&buf),
+-				bch2_btree_id_to_text(&buf, btree),
+-				buf.buf)))
+-			ret = bch2_btree_lost_data(c, btree);
+ 	}
+-fsck_err:
++
+ 	printbuf_exit(&buf);
+ 	bch2_trans_put(trans);
+ 	bch_err_fn(c, ret);
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0230-bcachefs-kill-__bch2_btree_iter_flags.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0230-bcachefs-kill-__bch2_btree_iter_flags.patch
new file mode 100644
index 0000000..211ad84
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0230-bcachefs-kill-__bch2_btree_iter_flags.patch
@@ -0,0 +1,101 @@
+From 989229db3f0720a5f16f5753356a4ce51124c072 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Sun, 15 Dec 2024 02:24:30 -0500
+Subject: [PATCH 230/233] bcachefs: kill __bch2_btree_iter_flags()
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+bch2_btree_iter_flags() now takes a level parameter; this fixes a bug
+where using a node iterator on a leaf wouldn't set
+BTREE_ITER_with_key_cache, leading to fun cache coherency bugs.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_iter.c |  7 +++++--
+ fs/bcachefs/btree_iter.h | 28 +++++++++++-----------------
+ 2 files changed, 16 insertions(+), 19 deletions(-)
+
+diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
+index a1c5fcced24e..291eb5eb0203 100644
+--- a/fs/bcachefs/btree_iter.c
++++ b/fs/bcachefs/btree_iter.c
+@@ -3032,7 +3032,7 @@ void bch2_trans_iter_init_outlined(struct btree_trans *trans,
+ 			  unsigned flags)
+ {
+ 	bch2_trans_iter_init_common(trans, iter, btree_id, pos, 0, 0,
+-			       bch2_btree_iter_flags(trans, btree_id, flags),
++			       bch2_btree_iter_flags(trans, btree_id, 0, flags),
+ 			       _RET_IP_);
+ }
+ 
+@@ -3048,8 +3048,11 @@ void bch2_trans_node_iter_init(struct btree_trans *trans,
+ 	flags |= BTREE_ITER_snapshot_field;
+ 	flags |= BTREE_ITER_all_snapshots;
+ 
++	if (!depth && btree_id_cached(trans->c, btree_id))
++		flags |= BTREE_ITER_with_key_cache;
++
+ 	bch2_trans_iter_init_common(trans, iter, btree_id, pos, locks_want, depth,
+-			       __bch2_btree_iter_flags(trans, btree_id, flags),
++			       bch2_btree_iter_flags(trans, btree_id, depth, flags),
+ 			       _RET_IP_);
+ 
+ 	iter->min_depth	= depth;
+diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
+index 3477fc8c0396..e23608d2a26d 100644
+--- a/fs/bcachefs/btree_iter.h
++++ b/fs/bcachefs/btree_iter.h
+@@ -446,10 +446,17 @@ static inline void bch2_btree_iter_set_snapshot(struct btree_iter *iter, u32 sna
+ 
+ void bch2_trans_iter_exit(struct btree_trans *, struct btree_iter *);
+ 
+-static inline unsigned __bch2_btree_iter_flags(struct btree_trans *trans,
+-					       unsigned btree_id,
+-					       unsigned flags)
++static inline unsigned bch2_btree_iter_flags(struct btree_trans *trans,
++					     unsigned btree_id,
++					     unsigned level,
++					     unsigned flags)
+ {
++	if (level || !btree_id_cached(trans->c, btree_id)) {
++		flags &= ~BTREE_ITER_cached;
++		flags &= ~BTREE_ITER_with_key_cache;
++	} else if (!(flags & BTREE_ITER_cached))
++		flags |= BTREE_ITER_with_key_cache;
++
+ 	if (!(flags & (BTREE_ITER_all_snapshots|BTREE_ITER_not_extents)) &&
+ 	    btree_id_is_extents(btree_id))
+ 		flags |= BTREE_ITER_is_extents;
+@@ -468,19 +475,6 @@ static inline unsigned __bch2_btree_iter_flags(struct btree_trans *trans,
+ 	return flags;
+ }
+ 
+-static inline unsigned bch2_btree_iter_flags(struct btree_trans *trans,
+-					     unsigned btree_id,
+-					     unsigned flags)
+-{
+-	if (!btree_id_cached(trans->c, btree_id)) {
+-		flags &= ~BTREE_ITER_cached;
+-		flags &= ~BTREE_ITER_with_key_cache;
+-	} else if (!(flags & BTREE_ITER_cached))
+-		flags |= BTREE_ITER_with_key_cache;
+-
+-	return __bch2_btree_iter_flags(trans, btree_id, flags);
+-}
+-
+ static inline void bch2_trans_iter_init_common(struct btree_trans *trans,
+ 					  struct btree_iter *iter,
+ 					  unsigned btree_id, struct bpos pos,
+@@ -517,7 +511,7 @@ static inline void bch2_trans_iter_init(struct btree_trans *trans,
+ 	if (__builtin_constant_p(btree_id) &&
+ 	    __builtin_constant_p(flags))
+ 		bch2_trans_iter_init_common(trans, iter, btree_id, pos, 0, 0,
+-				bch2_btree_iter_flags(trans, btree_id, flags),
++				bch2_btree_iter_flags(trans, btree_id, 0, flags),
+ 				_THIS_IP_);
+ 	else
+ 		bch2_trans_iter_init_outlined(trans, iter, btree_id, pos, flags);
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0231-bcachefs-Write-lock-btree-node-in-key-cache-fills.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0231-bcachefs-Write-lock-btree-node-in-key-cache-fills.patch
new file mode 100644
index 0000000..10891a8
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0231-bcachefs-Write-lock-btree-node-in-key-cache-fills.patch
@@ -0,0 +1,118 @@
+From 7b5ddd26bcf1f72e16e121c02533ee6192a3eea0 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Sat, 8 Jun 2024 17:01:31 -0400
+Subject: [PATCH 231/233] bcachefs: Write lock btree node in key cache fills
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+this addresses a key cache coherency bug
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/btree_key_cache.c | 34 ++++++++++++++++++++++------------
+ 1 file changed, 22 insertions(+), 12 deletions(-)
+
+diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c
+index 4eba2871f289..382f99b774b8 100644
+--- a/fs/bcachefs/btree_key_cache.c
++++ b/fs/bcachefs/btree_key_cache.c
+@@ -197,7 +197,9 @@ bkey_cached_reuse(struct btree_key_cache *c)
+ 	return ck;
+ }
+ 
+-static int btree_key_cache_create(struct btree_trans *trans, struct btree_path *path,
++static int btree_key_cache_create(struct btree_trans *trans,
++				  struct btree_path *path,
++				  struct btree_path *ck_path,
+ 				  struct bkey_s_c k)
+ {
+ 	struct bch_fs *c = trans->c;
+@@ -217,7 +219,7 @@ static int btree_key_cache_create(struct btree_trans *trans, struct btree_path *
+ 	key_u64s = min(256U, (key_u64s * 3) / 2);
+ 	key_u64s = roundup_pow_of_two(key_u64s);
+ 
+-	struct bkey_cached *ck = bkey_cached_alloc(trans, path, key_u64s);
++	struct bkey_cached *ck = bkey_cached_alloc(trans, ck_path, key_u64s);
+ 	int ret = PTR_ERR_OR_ZERO(ck);
+ 	if (ret)
+ 		return ret;
+@@ -226,19 +228,19 @@ static int btree_key_cache_create(struct btree_trans *trans, struct btree_path *
+ 		ck = bkey_cached_reuse(bc);
+ 		if (unlikely(!ck)) {
+ 			bch_err(c, "error allocating memory for key cache item, btree %s",
+-				bch2_btree_id_str(path->btree_id));
++				bch2_btree_id_str(ck_path->btree_id));
+ 			return -BCH_ERR_ENOMEM_btree_key_cache_create;
+ 		}
+ 	}
+ 
+ 	ck->c.level		= 0;
+-	ck->c.btree_id		= path->btree_id;
+-	ck->key.btree_id	= path->btree_id;
+-	ck->key.pos		= path->pos;
++	ck->c.btree_id		= ck_path->btree_id;
++	ck->key.btree_id	= ck_path->btree_id;
++	ck->key.pos		= ck_path->pos;
+ 	ck->flags		= 1U << BKEY_CACHED_ACCESSED;
+ 
+ 	if (unlikely(key_u64s > ck->u64s)) {
+-		mark_btree_node_locked_noreset(path, 0, BTREE_NODE_UNLOCKED);
++		mark_btree_node_locked_noreset(ck_path, 0, BTREE_NODE_UNLOCKED);
+ 
+ 		struct bkey_i *new_k = allocate_dropping_locks(trans, ret,
+ 				kmalloc(key_u64s * sizeof(u64), _gfp));
+@@ -258,22 +260,29 @@ static int btree_key_cache_create(struct btree_trans *trans, struct btree_path *
+ 
+ 	bkey_reassemble(ck->k, k);
+ 
++	ret = bch2_btree_node_lock_write(trans, path, &path_l(path)->b->c);
++	if (unlikely(ret))
++		goto err;
++
+ 	ret = rhashtable_lookup_insert_fast(&bc->table, &ck->hash, bch2_btree_key_cache_params);
++
++	bch2_btree_node_unlock_write(trans, path, path_l(path)->b);
++
+ 	if (unlikely(ret)) /* raced with another fill? */
+ 		goto err;
+ 
+ 	atomic_long_inc(&bc->nr_keys);
+ 	six_unlock_write(&ck->c.lock);
+ 
+-	enum six_lock_type lock_want = __btree_lock_want(path, 0);
++	enum six_lock_type lock_want = __btree_lock_want(ck_path, 0);
+ 	if (lock_want == SIX_LOCK_read)
+ 		six_lock_downgrade(&ck->c.lock);
+-	btree_path_cached_set(trans, path, ck, (enum btree_node_locked_type) lock_want);
+-	path->uptodate = BTREE_ITER_UPTODATE;
++	btree_path_cached_set(trans, ck_path, ck, (enum btree_node_locked_type) lock_want);
++	ck_path->uptodate = BTREE_ITER_UPTODATE;
+ 	return 0;
+ err:
+ 	bkey_cached_free(bc, ck);
+-	mark_btree_node_locked_noreset(path, 0, BTREE_NODE_UNLOCKED);
++	mark_btree_node_locked_noreset(ck_path, 0, BTREE_NODE_UNLOCKED);
+ 
+ 	return ret;
+ }
+@@ -293,6 +302,7 @@ static noinline int btree_key_cache_fill(struct btree_trans *trans,
+ 	int ret;
+ 
+ 	bch2_trans_iter_init(trans, &iter, ck_path->btree_id, ck_path->pos,
++			     BTREE_ITER_intent|
+ 			     BTREE_ITER_key_cache_fill|
+ 			     BTREE_ITER_cached_nofill);
+ 	iter.flags &= ~BTREE_ITER_with_journal;
+@@ -306,7 +316,7 @@ static noinline int btree_key_cache_fill(struct btree_trans *trans,
+ 	if (unlikely(ret))
+ 		goto out;
+ 
+-	ret = btree_key_cache_create(trans, ck_path, k);
++	ret = btree_key_cache_create(trans, btree_iter_path(trans, &iter), ck_path, k);
+ 	if (ret)
+ 		goto err;
+ 
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0232-bcachefs-Handle-BCH_ERR_need_mark_replicas-in-gc.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0232-bcachefs-Handle-BCH_ERR_need_mark_replicas-in-gc.patch
new file mode 100644
index 0000000..c1ec965
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0232-bcachefs-Handle-BCH_ERR_need_mark_replicas-in-gc.patch
@@ -0,0 +1,57 @@
+From b5677d4d8d295e42a91b437a1de8caa2791a4277 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Mon, 16 Dec 2024 13:58:02 -0500
+Subject: [PATCH 232/233] bcachefs: Handle -BCH_ERR_need_mark_replicas in gc
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Locking considerations (possibly no longer relevant?) mean that when an
+accounting update needs a new superblock replicas entry to be created,
+it's deferred to the transaction commit error path.
+
+But accounting updates for gc/fcsk aren't done from the transaction
+commit path - so we need to handle
+-BCH_ERR_btree_insert_need_mark_replicas locally.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/disk_accounting.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/fs/bcachefs/disk_accounting.c b/fs/bcachefs/disk_accounting.c
+index 72c8dcb9226f..b32e91ba8be8 100644
+--- a/fs/bcachefs/disk_accounting.c
++++ b/fs/bcachefs/disk_accounting.c
+@@ -79,6 +79,8 @@ static inline void accounting_key_init(struct bkey_i *k, struct disk_accounting_
+ 	memcpy_u64s_small(acc->v.d, d, nr);
+ }
+ 
++static int bch2_accounting_update_sb_one(struct bch_fs *, struct bpos);
++
+ int bch2_disk_accounting_mod(struct btree_trans *trans,
+ 			     struct disk_accounting_pos *k,
+ 			     s64 *d, unsigned nr, bool gc)
+@@ -96,9 +98,16 @@ int bch2_disk_accounting_mod(struct btree_trans *trans,
+ 
+ 	accounting_key_init(&k_i.k, k, d, nr);
+ 
+-	return likely(!gc)
+-		? bch2_trans_update_buffered(trans, BTREE_ID_accounting, &k_i.k)
+-		: bch2_accounting_mem_add(trans, bkey_i_to_s_c_accounting(&k_i.k), true);
++	if (unlikely(gc)) {
++		int ret = bch2_accounting_mem_add(trans, bkey_i_to_s_c_accounting(&k_i.k), true);
++		if (ret == -BCH_ERR_btree_insert_need_mark_replicas)
++			ret = drop_locks_do(trans,
++				bch2_accounting_update_sb_one(trans->c, disk_accounting_pos_to_bpos(k))) ?:
++				bch2_accounting_mem_add(trans, bkey_i_to_s_c_accounting(&k_i.k), true);
++		return ret;
++	} else {
++		return bch2_trans_update_buffered(trans, BTREE_ID_accounting, &k_i.k);
++	}
+ }
+ 
+ int bch2_mod_dev_cached_sectors(struct btree_trans *trans,
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/files/linux-6.12/0233-bcachefs-Fix-assert-for-online-fsck.patch b/sys-kernel/hardened-kernel/files/linux-6.12/0233-bcachefs-Fix-assert-for-online-fsck.patch
new file mode 100644
index 0000000..c0f8b41
--- /dev/null
+++ b/sys-kernel/hardened-kernel/files/linux-6.12/0233-bcachefs-Fix-assert-for-online-fsck.patch
@@ -0,0 +1,32 @@
+From ca2e7a3de895c703d2cbbd9b63c10d8adfba8228 Mon Sep 17 00:00:00 2001
+From: Kent Overstreet <kent.overstreet@linux.dev>
+Date: Mon, 16 Dec 2024 16:41:25 -0500
+Subject: [PATCH 233/233] bcachefs: Fix assert for online fsck
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+We can't check if we're racing with fsck ending until mark_lock is held.
+
+Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
+---
+ fs/bcachefs/disk_accounting.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fs/bcachefs/disk_accounting.h b/fs/bcachefs/disk_accounting.h
+index fc1b673689c8..5360cbb3ec29 100644
+--- a/fs/bcachefs/disk_accounting.h
++++ b/fs/bcachefs/disk_accounting.h
+@@ -138,7 +138,8 @@ static inline int bch2_accounting_mem_mod_locked(struct btree_trans *trans,
+ 	bpos_to_disk_accounting_pos(&acc_k, a.k->p);
+ 	bool gc = mode == BCH_ACCOUNTING_gc;
+ 
+-	EBUG_ON(gc && !acc->gc_running);
++	if (gc && !acc->gc_running)
++		return 0;
+ 
+ 	if (!bch2_accounting_is_mem(acc_k))
+ 		return 0;
+-- 
+2.45.2
+
diff --git a/sys-kernel/hardened-kernel/hardened-kernel-6.12.5.ebuild b/sys-kernel/hardened-kernel/hardened-kernel-6.12.6.ebuild
similarity index 100%
rename from sys-kernel/hardened-kernel/hardened-kernel-6.12.5.ebuild
rename to sys-kernel/hardened-kernel/hardened-kernel-6.12.6.ebuild