linux-next: manual merge of the btrfs tree with the fs-current tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 965 bytes --]

Hi all,

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

  fs/btrfs/tree-log.c

between commit:

  d1825752e3074 ("btrfs: use NOFS context when getting inodes during logging and log replay")

from the fs-current tree and commits:

  2eb717ce25c03 ("btrfs: use NOFS context when getting inodes during logging and log replay")
  8cfe0e0697c2d ("btrfs: remove super block argument from btrfs_iget()")

from the btrfs 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/btrfs/tree-log.c
index 0bce1d45e2526,f0cf8ce26f010..0000000000000
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]