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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

Today's linux-next merge of the fs-next tree got conflicts in:

  arch/arm64/include/asm/unistd.h
  arch/arm64/include/asm/unistd32.h

between commit:

  ea0130bf3c45 ("arm64: convert unistd_32.h to syscall.tbl format")

from the asm-generic tree and commit:

  e6873349f700 ("fs/xattr: add *at family syscalls")

from the vfs-brauner tree.

I fixed it up (I used the former versions) 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 --]