linux-uconsole/tools/include/uapi/linux
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
tc_act tools/bpftool: copy a few net uapi headers to tools directory 2018-11-09 08:18:31 +01:00
bpf.h bpf: fix up uapi helper description and sync bpf header with tools 2018-12-11 11:06: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
btf.h tools/bpf: Sync kernel btf.h header 2018-11-20 10:54:38 -08: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
fs.h tools include uapi: Update linux/fs.h copy 2018-10-31 09:57:51 -03:00
hw_breakpoint.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
if_link.h tools headers uapi: Update linux/if_link.h header copy 2018-10-31 09:57:54 -03:00
in.h tools include uapi: Grab a copy of linux/in.h 2018-07-31 10:52:37 -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: Sync the various kvm.h header copies 2018-10-31 09:57:53 -03:00
lirc.h bpf: add selftest for lirc_mode2 type program 2018-05-30 12:40:14 +02:00
mman.h tools include uapi: Update linux/mmap.h copy 2018-10-31 09:57:53 -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 perf tools: Don't clone maps from parent when synthesizing forks 2018-10-31 10:18:01 -03:00
pkt_cls.h tools/bpftool: copy a few net uapi headers to tools directory 2018-11-09 08:18:31 +01:00
prctl.h x86/speculation: Add prctl() control for indirect branch speculation 2018-11-28 11:57:13 +01:00
sched.h tools headers: Synchronize uapi/linux/sched.h 2018-02-02 17:17:13 -03:00
seg6.h selftests/bpf: missing headers test_lwt_seg6local 2018-05-28 17:41:00 +02:00
seg6_local.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
vhost.h tools headers uapi: Update tools's copy of linux/vhost.h 2018-09-11 13:12:40 -03:00