Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Trivial conflicts in net/can/isotp.c and
tools/testing/selftests/net/mptcp/mptcp_connect.sh

scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c
to include/linux/ptp_clock_kernel.h in -next so re-apply
the fix there.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2021-06-18 19:47:02 -07:00

..

tc_act

…

bpf_common.h

…

bpf_perf_event.h

tools, headers: Sync struct bpf_perf_event_data

2021-01-26 00:15:03 +01:00

bpf.h

bpf: Support socket migration by eBPF.

2021-06-15 18:01:06 +02:00

btf.h

bpf: Add BTF_KIND_FLOAT to uapi

2021-03-04 17:58:15 -08:00

const.h

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

2020-12-18 17:32:28 -03:00

erspan.h

…

ethtool.h

…

fadvise.h

…

fcntl.h

tools headers API: Update faccessat2 affected files

2020-06-09 12:40:03 -03:00

filter.h

tools: bpf: Use local copy of headers including uapi/linux/filter.h

2020-07-21 10:50:35 +01:00

fs.h

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

2021-05-21 16:00:31 -03:00

fscrypt.h

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

2020-12-18 17:32:28 -03:00

hw_breakpoint.h

…

if_link.h

Revert "GTP: add support for flow based tunneling API"

2021-02-04 09:29:57 -08:00

if_tun.h

…

if_xdp.h

xsk: Add new statistics

2020-07-13 15:32:56 -07:00

in.h

tools headers UAPI: update linux/in.h copy

2020-09-14 19:06:41 -03:00

kcmp.h

…

kvm.h

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2021-05-29 06:02:25 -10:00

lirc.h

…

mman.h

tools UAPI: Update copy of linux/mman.h from the kernel sources

2020-11-03 08:36:51 -03:00

mount.h

tools headers: Update syscall.tbl files to support mount_setattr

2021-03-06 16:54:30 -03:00

netlink.h

…

openat2.h

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

2021-03-06 16:54:22 -03:00

perf_event.h

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

2021-05-21 16:03:08 -03:00

pkt_cls.h

…

pkt_sched.h

sch_htb: Hierarchical QoS hardware offload

2021-01-22 20:41:29 -08:00

prctl.h

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

2021-05-10 09:01:00 -03:00

sched.h

tools headers UAPI: Sync sched.h with the kernel

2020-04-14 09:01:08 -03:00

seg6_local.h

…

seg6.h

…

stat.h

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

2020-12-17 14:40:24 -03:00

tcp.h

bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE

2021-01-20 14:23:00 -08:00

tls.h

…

types.h

tools/bpf: Move linux/types.h for selftests and bpftool

2020-03-13 20:56:34 +01:00

usbdevice_fs.h

…

vhost.h

tools kvm headers: Update KVM headers from the kernel sources

2020-11-03 08:46:30 -03:00