On Tue, Jun 22, 2021 at 3:38 AM Stephen Rothwell [off-list ref] wrote:

Hi Steven,

On Fri, 11 Jun 2021 11:12:31 +1000 Stephen Rothwell [off-list ref] wrote:

quoted

Today's linux-next merge of the gfs2 tree got conflicts in:

  Documentation/filesystems/porting.rst
  include/linux/uio.h
  lib/iov_iter.c

between various commits from the vfs tree and the same, older version,
of the commits from the gfs2 tree.

I fixed it up (I used the vfs tree versions) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

I got more conflicts today.

Can we please get that (old, buggy) version of this topic branch
removed from the gfs2 tree

Done.

Thanks,
Andreas