From: Linus Torvalds Date: Thu, 14 Dec 2023 19:53:00 +0000 (-0800) Subject: Merge tag 'for-6.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... X-Git-Tag: v6.7-rc6~22 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=bdb2701f0b6822d711ec34968ccef70b73a91da7;p=sfrench%2Fcifs-2.6.git Merge tag 'for-6.7-rc5-tag' of git://git./linux/kernel/git/kdave/linux Pull btrfs fixes from David Sterba: "Some fixes to quota accounting code, mostly around error handling and correctness: - free reserves on various error paths, after IO errors or transaction abort - don't clear reserved range at the folio release time, it'll be properly cleared after final write - fix integer overflow due to int used when passing around size of freed reservations - fix a regression in squota accounting that missed some cases with delayed refs" * tag 'for-6.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: ensure releasing squota reserve on head refs btrfs: don't clear qgroup reserved bit in release_folio btrfs: free qgroup pertrans reserve on transaction abort btrfs: fix qgroup_free_reserved_data int overflow btrfs: free qgroup reserve when ORDERED_IOERR is set --- bdb2701f0b6822d711ec34968ccef70b73a91da7