Merge branch 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull compat quotactl cleanups from Al Viro:
 "More Christoph's compat cleanups: quotactl(2)"

* 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  quota: simplify the quotactl compat handling
  compat: add a compat_need_64bit_alignment_fixup() helper
  compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>

diff --cc arch/x86/entry/syscalls/syscall_32.tbl
Simple merge

diff --cc fs/quota/quota.c
Simple merge

diff --cc include/linux/compat.h
Simple merge