mirror_ubuntu-kernels/tools/include/uapi/linux
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07: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 bpf: Sync bpf.h to tools/ 2018-07-15 00:08:41 +02:00
btf.h bpf: btf: Sync uapi btf.h to tools 2018-07-25 06:57:55 +02:00
erspan.h tools, include: Grab a copy of linux/erspan.h 2018-04-30 17:56:24 +02:00
fcntl.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
hw_breakpoint.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
if_link.h tools include uapi: Update if_link.h to pick IFLA_{BRPORT_ISOLATED,VXLAN_TTL_INHERIT} 2018-06-25 11:59:36 -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: Pick up latest kernel ABIs 2018-06-26 08:43:14 +02:00
lirc.h bpf: add selftest for lirc_mode2 type program 2018-05-30 12:40:14 +02:00
mman.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
netlink.h tools: add netlink.h and if_link.h in tools uapi 2018-02-02 17:53:47 -08:00
perf_event.h perf/core: Store context switch out type in PERF_RECORD_SWITCH[_CPU_WIDE] 2018-04-17 09:47:39 -03:00
prctl.h docs: Fix some broken references 2018-06-15 18:10:01 -03:00
sched.h tools headers: Synchronize uapi/linux/sched.h 2018-02-02 17:17:13 -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
vhost.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00