linux_dsm_epyc7002/arch/parisc/include/uapi/asm
David S. Miller 16ae1f2236 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-03-23 16:41:27 -07:00
..
bitsperlong.h parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header 2017-01-28 21:54:23 +01:00
byteorder.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
errno.h parisc: Fix order of EREFUSED define in errno.h 2016-08-20 13:33:53 +02:00
fcntl.h Safer ABI for O_TMPFILE 2013-07-13 13:26:37 +04:00
ioctl.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
ioctls.h parisc/uapi: Add definition of TIOC[SG]RS485 2014-09-09 22:36:40 -07:00
ipcbuf.h parisc: Fixes and cleanups in kernel uapi header files 2015-11-08 20:27:01 +01:00
Kbuild parisc: Use generic uapi/asm/resource.h file 2014-05-01 19:29:26 +02:00
mman.h x86/pkeys: Allocation/free syscalls 2016-09-09 13:02:27 +02:00
msgbuf.h parisc: Fixes and cleanups in kernel uapi header files 2015-11-08 20:27:01 +01:00
pdc.h parisc: Fix typo in pdc.h 2016-05-22 21:55:33 +02:00
posix_types.h parisc: Fixes and cleanups in kernel uapi header files 2015-11-08 20:27:01 +01:00
ptrace.h parisc: Add ARCH_TRACEHOOK and regset support 2016-05-22 21:39:13 +02:00
sembuf.h parisc: Fixes and cleanups in kernel uapi header files 2015-11-08 20:27:01 +01:00
setup.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
shmbuf.h parisc: Fixes and cleanups in kernel uapi header files 2015-11-08 20:27:01 +01:00
sigcontext.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
siginfo.h parisc: Drop parisc-specific NSIGTRAP define 2016-01-12 22:06:15 +01:00
signal.h parisc: Avoid using CONFIG_64BIT in userspace exported headers 2014-11-10 22:25:29 +01:00
socket.h sock: introduce SO_MEMINFO getsockopt 2017-03-22 11:18:58 -07:00
sockios.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
stat.h parisc: Drop hpux_stat64 struct from stat.h header file 2015-11-08 20:26:24 +01:00
statfs.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
swab.h parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header 2017-01-28 21:54:23 +01:00
termbits.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
termios.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
types.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
unistd.h parisc: Wire up statx system call 2017-03-15 21:11:27 +01:00