mirror_ubuntu-kernels/tools/include/uapi/linux
David S. Miller 4dc6758d78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-11-10 10:00:18 +09:00
..
bpf_common.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
bpf_perf_event.h selftests/bpf: fix broken build 2017-03-12 23:48:41 -07:00
bpf.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-10 10:00:18 +09: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
kvm.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
mman.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
perf_event.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
sched.h tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01: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