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

Conflicts:
	arch/m68k/include/asm/termios.h
	arch/m68k/include/uapi/asm/auxvec.h
	arch/m68k/include/uapi/asm/msgbuf.h
	arch/m68k/include/uapi/asm/sembuf.h
	arch/m68k/include/uapi/asm/shmbuf.h
	arch/m68k/include/uapi/asm/socket.h
	arch/m68k/include/uapi/asm/sockios.h
	arch/m68k/include/uapi/asm/termbits.h

diff --cc arch/m68k/include/asm/Kbuild
index 88fa3ac86fae9af988331112cba87ff711eb3555,9c4a654b078af41021d820171449975a6aa1ce0b..fe821a2da2979856d054d82ffc461292b7cc3225
--- 1/arch/m68k/include/asm/Kbuild
--- 2/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@@ -1,4 -1,7 +1,5 @@@
 -include include/asm-generic/Kbuild.asm
 -header-y += cachectl.h
  
+ generic-y += auxvec.h
  generic-y += bitsperlong.h
  generic-y += clkdev.h
  generic-y += cputime.h

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