mirror_ubuntu-kernels/tools/include/uapi/linux
David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-22 13:39:14 +01:00
..
bpf_common.h tools lib bpf: Copy bpf.h and bpf_common.h from the kernel 2016-07-12 15:20:32 -03: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-10-22 13:39:14 +01:00
fcntl.h tools: Update include/uapi/linux/fcntl.h copy from the kernel 2017-07-18 23:13:50 -03:00
hw_breakpoint.h hw_breakpoint: Allow watchpoint of length 3,5,6 and 7 2016-11-18 17:23:17 +00:00
kvm.h tools include: Sync kernel ABI headers with tooling headers 2017-09-25 10:39:44 -03:00
mman.h tools include: Sync kernel ABI headers with tooling headers 2017-09-25 10:39:44 -03:00
perf_event.h perf tools: Support new sample type for physical address 2017-09-01 14:46:00 -03:00
sched.h tools include uapi: Grab a copy of linux/sched.h 2017-07-20 11:02:51 -03:00
stat.h tools/include: Sync kernel ABI headers with tooling headers 2017-05-24 09:00:21 +02:00
vhost.h tools include uapi: Grab a copy of linux/vhost.h 2017-08-01 13:04:56 -03:00