Re: linux-next: manual merge of the gfs2 tree with the vfs tree

Hi all, On Mon, 8 Jul 2019 13:48:42 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the gfs2 tree got a conflict in: > > fs/gfs2/super.c > > between commit: > > 000c8e591016 ("gfs2: Convert gfs2 to fs_context") > > from the vfs tree and commit: > > 5b3a9f348bc5 ("gfs2: k

linux-next: manual merge of the gfs2 tree with the vfs tree

Hi all, Today's linux-next merge of the gfs2 tree got a conflict in: fs/gfs2/super.c between commit: 000c8e591016 ("gfs2: Convert gfs2 to fs_context") from the vfs tree and commit: 5b3a9f348bc5 ("gfs2: kthread and remount improvements") from the gfs2 tree. I fixed it up (I just used t