Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/smb/client/cifsencrypt.c
between commit:
192bbbf2bd41 ("cifs: Fix signature miscalculation")
from the cifs tree and commits:
4aa571d67e81 ("cifs: Don't support ITER_XARRAY")
from the vfs-brauner tree.
I fixed it up (the latter removed the line update by the former, so I just
use latter version) 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:
pgpW2Q6Bq0ya8.pgp
Description: OpenPGP digital signature
