linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the ntfs3 tree with Linus' tree
@ 2021-10-05 23:15 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-10-05 23:15 UTC (permalink / raw)
  To: Konstantin Komarov; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

[-- 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 --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-05 23:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 23:15 linux-next: manual merge of the ntfs3 tree with Linus' tree Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).