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

[Mark Brown]

Hi all,

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

  fs/gfs2/lops.c

between commit:

  469d71512d135 ("Revert "gfs2: Fix use of bio_chain"")

from the origin tree and commits:

  c0c8c960ab932 ("Revert "gfs2: Fix use of bio_chain"")
  910869abc1ca8 ("gfs2: gfs2_chain_bio start sector fix")

from the gfs2 tree.

I fixed it up (see below) 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.

diff --cc fs/gfs2/lops.c
index d27a0b1080a97,e03928def87ed..0000000000000
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c

Attachment: signature.asc
Description: PGP signature