linux-next: manual merge of the vfs-brauner tree with the mm tree

Stephen Rothwell
2023-05-24T00:06:40Z

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

Hi all,

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

fs/ntfs/mft.c

between commit:

e7c5ef2adfdf ("ntfs: do not dereference a null ctx on error")

from the mm tree and commit:

ee3b4556cee8 ("ntfs: do not dereference a null ctx on error")

from the vfs-brauner tree.

I fixed it up (the latter seems to be a newer version, so I just used
that) 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.