Merge tag 'for-6.6-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Oct 2023 20:58:32 +0000 (13:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Oct 2023 20:58:32 +0000 (13:58 -0700)
commit759d1b653f3c7c2249b7fe5f6b218f87a5842822
tree1a1c4e39834a20b4fae41227bbbc7690cc7aaec2
parent8182d7a3f1b8982c0136dca82a846ea375a4d6e9
parent75f5f60bf7ee075ed4a29637ce390898b4c36811
Merge tag 'for-6.6-rc5-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "A revert of recent mount option parsing fix, this breaks mounts with
  security options.

  The second patch is a flexible array annotation"

* tag 'for-6.6-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: add __counted_by for struct btrfs_delayed_item and use struct_size()
  Revert "btrfs: reject unknown mount options early"
fs/btrfs/delayed-inode.c