linux-xiaomi-chiron/tools/include/uapi/linux
Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

MAINTAINERS
 - keep Chandrasekar
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
 - simple fix + trust the code re-added to param.c in -next is fine
include/linux/bpf.h
 - trivial
include/linux/ethtool.h
 - trivial, fix kdoc while at it
include/linux/skmsg.h
 - move to relevant place in tcp.c, comment re-wrapped
net/core/skmsg.c
 - add the sk = sk // sk = NULL around calls
net/tipc/crypto.c
 - trivial

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-04-09 20:48:35 -07:00
..
tc_act
bpf.h sock_map: Introduce BPF_SK_SKB_VERDICT 2021-04-01 10:56:14 -07:00
bpf_common.h
bpf_perf_event.h
btf.h bpf: Add BTF_KIND_FLOAT to uapi 2021-03-04 17:58:15 -08:00
const.h
erspan.h
ethtool.h
fadvise.h
fcntl.h
filter.h
fs.h
fscrypt.h
hw_breakpoint.h
if_link.h
if_tun.h
if_xdp.h
in.h
kcmp.h
kvm.h tools headers UAPI: Sync linux/kvm.h with the kernel sources 2021-03-10 09:18:30 -03:00
lirc.h
mman.h
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
pkt_cls.h
pkt_sched.h
prctl.h tools headers UAPI: Sync linux/prctl.h with the kernel sources 2021-02-11 12:50:52 -03:00
sched.h
seg6.h
seg6_local.h
stat.h
tcp.h
tls.h
types.h
usbdevice_fs.h
vhost.h