On Tue, Apr 27, 2021 at 11:31:19AM -0700, Linus Torvalds wrote: > Btw, unrelated to that, this pull request got a conflict with > > 64708539cd23 ("btrfs: use btrfs_inode_lock/btrfs_inode_unlock inode > lock helpers") > > which I think I sorted out correctly (the "inode_lock()" is now done > by the VFS layer for the fileattr things, and the btrfs use of > "btrfs_inode_lock/btrfs_inode_unlock" ended up being undone). But just > to be safe I'm cc'ing the btrfs people involved. Please double-check > that I didn't screw something up. Checked, it's ok. Thanks.