From: Linus Torvalds Date: Sun, 3 May 2020 18:30:08 +0000 (-0700) Subject: Merge tag 'for-5.7-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... X-Git-Tag: v5.7-rc4~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=262f7a6b8317a06e7d51befb690f0bca06a473ea;p=linux-block.git Merge tag 'for-5.7-rc3-tag' of git://git./linux/kernel/git/kdave/linux Pull more btrfs fixes from David Sterba: "A few more stability fixes, minor build warning fixes and git url fixup: - fix partial loss of prealloc extent past i_size after fsync - fix potential deadlock due to wrong transaction handle passing via journal_info - fix gcc 4.8 struct intialization warning - update git URL in MAINTAINERS entry" * tag 'for-5.7-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: MAINTAINERS: btrfs: fix git repo URL btrfs: fix gcc-4.8 build warning for struct initializer btrfs: transaction: Avoid deadlock due to bad initialization timing of fs_info::journal_info btrfs: fix partial loss of prealloc extent past i_size after fsync --- 262f7a6b8317a06e7d51befb690f0bca06a473ea diff --cc MAINTAINERS index 26f281d9f32a,6f9dcfe89e9f..2926327e4976 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3654,11 -3606,11 +3654,11 @@@ M: Chris Mason M: David Sterba L: linux-btrfs@vger.kernel.org +S: Maintained W: http://btrfs.wiki.kernel.org/ Q: http://patchwork.kernel.org/project/linux-btrfs/list/ - T: git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git + T: git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git -S: Maintained -F: Documentation/filesystems/btrfs.txt +F: Documentation/filesystems/btrfs.rst F: fs/btrfs/ F: include/linux/btrfs* F: include/uapi/linux/btrfs*