David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-06-17 20:20:36 -07:00

..

tc_act

net: Move all TC actions identifiers to one place

2019-02-10 09:28:43 -08:00

bpf_common.h

bpf: Sync kernel ABI header with tooling header for bpf_common.h

2018-02-09 00:24:38 +01:00

bpf_perf_event.h

selftests/bpf: sync kernel headers and introduce arch support in Makefile

2017-12-05 15:02:41 +01:00

bpf.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-06-17 20:20:36 -07:00

btf.h

tools/bpf: Sync kernel btf.h header

2019-05-14 10:06:23 +02:00

erspan.h

tools, include: Grab a copy of linux/erspan.h

2018-04-30 17:56:24 +02:00

ethtool.h

libbpf: add support for using AF_XDP sockets

2019-02-25 23:21:42 +01:00

fadvise.h

tools headers uapi: Grab a copy of fadvise.h

2018-12-18 16:17:40 -03:00

fcntl.h

tools include UAPI: Update copy of files related to new fspick, fsmount, fsconfig, fsopen, move_mount and open_tree syscalls

2019-05-28 09:49:03 -03:00

fs.h

tools headers UAPI: Sync linux/fs.h with the kernel

2019-05-28 09:49:03 -03:00

hw_breakpoint.h

tools/headers: Synchronize kernel ABI headers

2017-11-04 09:27:46 +01:00

if_link.h

tools: sync uapi/linux/if_link.h header

2019-02-14 15:31:39 -08:00

if_tun.h

selftests/bpf: fix compilation error for flow_dissector.c

2019-05-29 15:15:07 +02:00

if_xdp.h

libbpf: add support for using AF_XDP sockets

2019-02-25 23:21:42 +01:00

in.h

tools headers uapi: Update linux/in.h copy

2019-03-11 16:13:05 -03:00

kcmp.h

tools headers: Synchronize kernel ABI headers wrt SPDX tags

2017-11-28 14:29:20 -03:00

kvm.h

tools headers UAPI: Sync kvm.h headers with the kernel sources

2019-05-28 09:52:23 -03:00

lirc.h

media: rc: rcmm decoder and encoder

2019-02-18 15:39:49 -05:00

mman.h

tools headers uapi: Sync asm-generic/mman-common.h and linux/mman.h

2019-03-28 14:31:56 -03:00

mount.h

tools include UAPI: Update copy of files related to new fspick, fsmount, fsconfig, fsopen, move_mount and open_tree syscalls

2019-05-28 09:49:03 -03:00

netlink.h

net: netlink: rename NETLINK_DUMP_STRICT_CHK -> NETLINK_GET_STRICT_CHK

2018-12-14 11:44:31 -08:00

perf_event.h

tools headers uapi: Sync tools/include/uapi/linux/perf_event.h

2019-01-21 17:00:57 -03:00

pkt_cls.h

net: sched: remove NET_CLS_IND config option

2019-06-15 14:06:13 -07:00

pkt_sched.h

bpf: pull in pkt_sched.h header for tooling to fix bpftool build

2019-01-18 15:16:36 -08:00

prctl.h

x86/speculation: Add PR_SPEC_DISABLE_NOEXEC

2019-01-29 22:11:49 +01:00

sched.h

tools headers UAPI: Sync linux/sched.h with the kernel

2019-05-28 09:49:03 -03:00

seg6_local.h

selftests/bpf: missing headers test_lwt_seg6local

2018-05-28 17:41:00 +02:00

seg6.h

selftests/bpf: missing headers test_lwt_seg6local

2018-05-28 17:41:00 +02:00

stat.h

tools/headers: Synchronize kernel ABI headers

2017-11-04 09:27:46 +01:00

tls.h

bpf, tls: add tls header to tools infrastructure

2018-10-16 08:10:01 -07:00

usbdevice_fs.h

tools headers uapi: Grab a copy of usbdevice_fs.h

2018-12-28 16:33:04 -03:00

vhost.h

tools include uapi: Sync linux/vhost.h with the kernel sources

2019-01-08 14:09:33 -03:00