AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-20 06:08:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
1459143386
linux_dsm_epyc7002/arch/parisc/include/uapi/asm
History
David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-21 22:28:24 -05:00
..
bitsperlong.h parisc: Avoid using CONFIG_64BIT in userspace exported headers 2014-11-10 22:25:29 +01:00
byteorder.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
errno.h parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc 2014-02-02 20:57:42 +01: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 UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
Kbuild parisc: Use generic uapi/asm/resource.h file 2014-05-01 19:29:26 +02:00
mman.h mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB 2012-12-11 17:22:25 -08:00
msgbuf.h parisc: Avoid using CONFIG_64BIT in userspace exported headers 2014-11-10 22:25:29 +01:00
pdc.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
posix_types.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
ptrace.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
sembuf.h parisc: Avoid using CONFIG_64BIT in userspace exported headers 2014-11-10 22:25:29 +01:00
setup.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
shmbuf.h parisc: Avoid using CONFIG_64BIT in userspace exported headers 2014-11-10 22:25:29 +01:00
sigcontext.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
siginfo.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
signal.h parisc: Avoid using CONFIG_64BIT in userspace exported headers 2014-11-10 22:25:29 +01:00
socket.h net: introduce SO_INCOMING_CPU 2014-11-11 13:00:06 -05:00
sockios.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
stat.h parisc: convert uapi/asm/stat.h to use native types only 2014-02-02 20:57:33 +01:00
statfs.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
swab.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +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 bpf syscall 2014-11-10 22:20:40 +01:00