David S. Miller 446bf64b61 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf.

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

2019-08-19 11:54:03 -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

2019-08-19 11:54:03 -07:00

btf.h

…

erspan.h

…

ethtool.h

…

fadvise.h

…

fcntl.h

…

fs.h

…

hw_breakpoint.h

…

if_link.h

tools headers UAPI: Sync if_link.h with the kernel

2019-07-29 09:03:43 -03:00

if_tun.h

…

if_xdp.h

xsk: Add getsockopt XDP_OPTIONS

2019-06-27 22:53:26 +02:00

in.h

…

kcmp.h

…

kvm.h

Merge tag 'perf-urgent-for-mingo-5.3-20190729' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

2019-07-29 23:24:07 +02:00

lirc.h

…

mman.h

…

mount.h

…

netlink.h

…

perf_event.h

…

pkt_cls.h

net: sched: remove NET_CLS_IND config option

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

pkt_sched.h

…

prctl.h

…

sched.h

tools headers UAPI: Sync sched.h with the kernel

2019-07-29 09:03:43 -03:00

seg6_local.h

…

seg6.h

…

stat.h

…

tls.h

…

usbdevice_fs.h

tools headers UAPI: Sync usbdevice_fs.h with the kernels to get new ioctl

2019-07-29 09:03:43 -03:00

vhost.h

…