linux-next: manual merge of the ntfs3 tree with Linus' tree

linux-next: manual merge of the ntfs3 tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  fs/ntfs3/inode.c

between commit:

  6bf414a00ae7 ("ntfs3: replace ll_rw_block()")

from Linus' tree and commit:

  2f56a3f8d824 ("fs/ntfs3: Fixing work with sparse clusters")

from the ntfs3 tree.

I fixed it up (I just used the latter) 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.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the ntfs3 tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  fs/ntfs3/bitmap.c

between commit:

  70a1cb106d94 ("lib/bitmap: don't call __bitmap_weight() in kernel code")

from Linus' tree and commit:

  08811ba59a61 ("fs/ntfs3: Add ntfs_bitmap_weight_le function and refactoring")

from the ntfs3 tree.

I fixed it up (I just used the latter) 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.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the ntfs3 tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  fs/ntfs3/xattr.c

between commit:

  f7464060f7ab ("Merge git://github.com/Paragon-Software-Group/linux-ntfs3")

from Linus' tree and commits:

  d81e06be921f ("fs/ntfs3: Remove locked argument in ntfs_set_ea")
  95dd8b2c1ed0 ("fs/ntfs3: Remove unnecessary functions")

from the ntfs3 tree.

I fixed it up (I just used the latter where they conflicted) 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.

-- 
Cheers,
Stephen Rothwell

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