From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 May 2021 16:43:16 +0000 (-0700)
Subject: Merge tag 'for-5.13-rc1-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: microblaze-v5.15~415
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=88b06399c9c766c283e070b022b5ceafa4f63f19;p=linux-2.6-microblaze.git

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
---

88b06399c9c766c283e070b022b5ceafa4f63f19