Merge remote-tracking branch 'm68knommu/for-next'

diff --cc arch/m68k/include/uapi/asm/Kbuild
index 972bce120e1e94b8550408f788e0502ecd3d308f,972bce120e1e94b8550408f788e0502ecd3d308f..aebdbf5a4db463ca3367d43000c1261876112fc4
--- 1/arch/m68k/include/uapi/asm/Kbuild
--- 2/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@@ -2,25 -2,25 +2,17 @@@
  include include/uapi/asm-generic/Kbuild.asm
  
  header-y += a.out.h
--header-y += auxvec.h
  header-y += byteorder.h
  header-y += cachectl.h
  header-y += fcntl.h
  header-y += ioctls.h
--header-y += msgbuf.h
  header-y += param.h
  header-y += poll.h
  header-y += posix_types.h
  header-y += ptrace.h
--header-y += sembuf.h
  header-y += setup.h
--header-y += shmbuf.h
  header-y += sigcontext.h
  header-y += signal.h
--header-y += socket.h
--header-y += sockios.h
  header-y += stat.h
  header-y += swab.h
--header-y += termbits.h
--header-y += termios.h
  header-y += unistd.h