linux-next: manual merge of the tip tree with the powerpc tree

[Mark Brown]

Hi all,

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

  arch/powerpc/kernel/compat_audit.c

between commit:

  f26ad12356a27 ("powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC")

from the powerpc tree and commit:

  9b444349a2e96 ("powerpc/audit: Directly include unistd_32.h from compat_audit.c")

from the tip tree.

I fixed it up (see below) 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.

[Deleted the file as per the PowerPC tree]

Attachment: signature.asc
Description: PGP signature