Merge tag 'for-5.13-rc1-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 May 2021 16:43:16 +0000 (09:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 May 2021 16:43:16 +0000 (09:43 -0700)
commit88b06399c9c766c283e070b022b5ceafa4f63f19
treecb6ac55ee01c808fbf0b59b9df32d33eca6dd4be
parent1140ab592e2ebf8153d2b322604031a8868ce7a5
parent9b8a233bc294dd71d3c7d30692a78ab32f246a0f
Merge tag 'for-5.13-rc1-part2-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fix from David Sterba:
 "Handle transaction start error in btrfs_fileattr_set()

  This is fix for code introduced by the new fileattr merge"

* tag 'for-5.13-rc1-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: handle transaction start error in btrfs_fileattr_set
fs/btrfs/ioctl.c