David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.

Signed-off-by: David S. Miller <davem@davemloft.net>

2020-07-11 00:46:00 -07:00

..

tc_act

…

bpf_common.h

…

bpf_perf_event.h

…

bpf.h

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

2020-07-11 00:46:00 -07:00

btf.h

libbpf: Sanitize global functions

2020-01-10 17:20:07 +01:00

const.h

tools headers: Grab copy of linux/const.h, needed by linux/bits.h

2019-08-20 12:08:23 -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

fs.h

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

2020-06-17 13:23:02 -03:00

fscrypt.h

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

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

hw_breakpoint.h

…

if_link.h

net: bridge: Add port attribute IFLA_BRPORT_MRP_RING_OPEN

2020-04-27 11:40:25 -07:00

if_tun.h

selftests/bpf: fix compilation error for flow_dissector.c

2019-05-29 15:15:07 +02:00

if_xdp.h

libbpf: add flags to umem config

2019-08-31 01:08:26 +02:00

in.h

tools headers uapi: Update linux/in.h copy

2020-03-24 10:35:58 -03:00

kcmp.h

…

kvm.h

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

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

lirc.h

…

mman.h

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

2020-04-14 09:04:53 -03:00

mount.h

tools include UAPI: Update copy of files related to new fspick, fsmount, fsconfig, fsopen, move_mount and open_tree syscalls

2019-05-28 09:49:03 -03:00

netlink.h

…

openat2.h

tools include UAPI: Sync x86's syscalls_64.tbl, generic unistd.h and fcntl.h to pick up openat2 and pidfd_getfd

2020-02-11 16:41:06 -03:00

perf_event.h

tools headers UAPI: Update tools's copy of linux/perf_event.h

2020-04-02 12:51:49 -03:00

pkt_cls.h

net: sched: remove NET_CLS_IND config option

2019-06-15 14:06:13 -07:00

pkt_sched.h

…

prctl.h

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

2020-02-11 16:41:50 -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-06-09 12:40:03 -03: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

tools headers uapi: Sync linux/usbdevice_fs.h with the kernel sources

2019-09-30 17:29:02 -03:00

vhost.h

tools include UAPI: Sync linux/vhost.h with the kernel sources

2020-06-17 13:22:41 -03:00