History

Merge tag 'net-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski: "Including fixes from netfilter and bpf. Current release - regressions: - sched: fix SKB_NOT_DROPPED_YET splat under debug config Current release - new code bugs: - tcp: - fix usec timestamps with TCP fastopen - fix possible out-of-bounds reads in tcp_hash_fail() - fix SYN option room calculation for TCP-AO - tcp_sigpool: fix some off by one bugs - bpf: fix compilation error without CGROUPS - ptp: - ptp_read() should not release queue - fix tsevqs corruption Previous releases - regressions: - llc: verify mac len before reading mac header Previous releases - always broken: - bpf: - fix check_stack_write_fixed_off() to correctly spill imm - fix precision tracking for BPF_ALU | BPF_TO_BE | BPF_END - check map->usercnt after timer->timer is assigned - dsa: lan9303: consequently nested-lock physical MDIO - dccp/tcp: call security_inet_conn_request() after setting IP addr - tg3: fix the TX ring stall due to incorrect full ring handling - phylink: initialize carrier state at creation - ice: fix direction of VF rules in switchdev mode Misc: - fill in a bunch of missing MODULE_DESCRIPTION()s, more to come" * tag 'net-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (84 commits) net: ti: icss-iep: fix setting counter value ptp: fix corrupted list in ptp_open ptp: ptp_read should not release queue net_sched: sch_fq: better validate TCA_FQ_WEIGHTS and TCA_FQ_PRIOMAP net: kcm: fill in MODULE_DESCRIPTION() net/sched: act_ct: Always fill offloading tuple iifidx netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses netfilter: xt_recent: fix (increase) ipv6 literal buffer length ipvs: add missing module descriptions netfilter: nf_tables: remove catchall element in GC sync path netfilter: add missing module descriptions drivers/net/ppp: use standard array-copy-function net: enetc: shorten enetc_setup_xdp_prog() error message to fit NETLINK_MAX_FMTMSG_LEN virtio/vsock: Fix uninit-value in virtio_transport_recv_pkt() r8169: respect userspace disabling IFF_MULTICAST selftests/bpf: get trusted cgrp from bpf_iter__cgroup directly bpf: Let verifier consider {task,cgroup} is trusted in bpf_iter_reg net: phylink: initialize carrier state at creation test/vsock: add dobule bind connect test test/vsock: refactor vsock_accept ...

Linus Torvalds committed 3 years ago

Commit 89cdf9d2 parents 3b22041 83b9dda178 files · +1240 −432Browse files

Showing the changes to include/uapi/linux (1 of 178 files). Show all

Unified · Split

include/uapi/linux/nfsd_netlink.h+3−3
@@ -3,8 +3,8 @@ · 2 unmodified lines
33 /* Documentation/netlink/specs/nfsd.yaml */
44 /* YNL-GEN uapi header */
55
6−#ifndef _UAPI_LINUX_NFSD_H
7−#define _UAPI_LINUX_NFSD_H
6+#ifndef _UAPI_LINUX_NFSD_NETLINK_H
7+#define _UAPI_LINUX_NFSD_NETLINK_H
88
99 #define NFSD_FAMILY_NAME "nfsd"
1010 #define NFSD_FAMILY_VERSION 1
@@ -36,4 +36,4 @@ enum { · 25 unmodified lines
3636 NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1)
3737 };
3838
39−#endif /* _UAPI_LINUX_NFSD_H */
39+#endif /* _UAPI_LINUX_NFSD_NETLINK_H */