From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Aug 2024 17:06:26 +0000 (-0700)
Subject: Merge tag 'bcachefs-2024-08-10' of git://evilpiepirate.org/bcachefs
X-Git-Tag: v6.11-rc3~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31b244460634c74430745a74e56f5c88c43f079b;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'bcachefs-2024-08-10' of git://evilpiepirate.org/bcachefs

Pull more bcachefs fixes from Kent Overstreet:
 "A couple last minute fixes for the new disk accounting

   - fix a bug that was causing ACLs to seemingly "disappear"

   - new on disk format version, bcachefs_metadata_version_disk_accounting_v3

     bcachefs_metadata_version_disk_accounting_v2 accidentally included
     padding in disk_accounting_key; fortunately, 6.11 isn't out yet so
     we can fix this with another version bump"

* tag 'bcachefs-2024-08-10' of git://evilpiepirate.org/bcachefs:
  bcachefs: bcachefs_metadata_version_disk_accounting_v3
  bcachefs: improve bch2_dev_usage_to_text()
  bcachefs: bch2_accounting_invalid()
  bcachefs: Switch to .get_inode_acl()
---

31b244460634c74430745a74e56f5c88c43f079b