History

Merge tag 'v5.9-rc4' into patchwork

Linux 5.9-rc4 * tag 'v5.9-rc4': (1001 commits) Linux 5.9-rc4 io_uring: fix linked deferred ->files cancellation io_uring: fix cancel of deferred reqs with ->files include/linux/log2.h: add missing () around n in roundup_pow_of_two() mm/khugepaged.c: fix khugepaged's request size in collapse_file mm/hugetlb: fix a race between hugetlb sysctl handlers mm/hugetlb: try preferred node first when alloc gigantic page from cma mm/migrate: preserve soft dirty in remove_migration_pte() mm/migrate: remove unnecessary is_zone_device_page() check mm/rmap: fixup copying of soft dirty and uffd ptes mm/migrate: fixup setting UFFD_WP flag mm: madvise: fix vma user-after-free checkpatch: fix the usage of capture group ( ... ) fork: adjust sysctl_max_threads definition to match prototype ipc: adjust proc_ipc_sem_dointvec definition to match prototype mm: track page table modifications in __apply_to_page_range() MAINTAINERS: IA64: mark Status as Odd Fixes only MAINTAINERS: add LLVM maintainers MAINTAINERS: update Cavium/Marvell entries mm: slub: fix conversion of freelist_corrupted() ...

Mauro Carvalho Chehab committed 6 years ago

Commit d13ee582 parents 72a9ff3 f4d51df2050 files · +13420 −8275Browse files

Showing the changes to include/uapi (3 of 2050 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/bpf.h +5 −5
  2. include/uapi/linux/in.h +1 −1
  3. include/uapi/linux/netfilter/nf_tables.h +1 −1
include/uapi/linux/bpf.h+5−5
@@ -767,7 +767,7 @@ union bpf_attr { · 766 unmodified lines
767767 *
768768 * Also, note that **bpf_trace_printk**\ () is slow, and should
769769 * only be used for debugging purposes. For this reason, a notice
770− * bloc (spanning several lines) is printed to kernel logs and
770+ * block (spanning several lines) is printed to kernel logs and
771771 * states that the helper should not be used "for production use"
772772 * the first time this helper is used (or more precisely, when
773773 * **trace_printk**\ () buffers are allocated). For passing values
@@ -1033,14 +1033,14 @@ union bpf_attr { · 259 unmodified lines
10331033 *
10341034 * int ret;
10351035 * struct bpf_tunnel_key key = {};
1036− *
1036+ *
10371037 * ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0);
10381038 * if (ret < 0)
10391039 * return TC_ACT_SHOT; // drop packet
1040− *
1040+ *
10411041 * if (key.remote_ipv4 != 0x0a000001)
10421042 * return TC_ACT_SHOT; // drop packet
1043− *
1043+ *
10441044 * return TC_ACT_OK; // accept packet
10451045 *
10461046 * This interface can also be used with all encapsulation devices
@@ -1147,7 +1147,7 @@ union bpf_attr { · 100 unmodified lines
11471147 * Description
11481148 * Retrieve the realm or the route, that is to say the
11491149 * **tclassid** field of the destination for the *skb*. The
1150− * indentifier retrieved is a user-provided tag, similar to the
1150+ * identifier retrieved is a user-provided tag, similar to the
11511151 * one used with the net_cls cgroup (see description for
11521152 * **bpf_get_cgroup_classid**\ () helper), but here this tag is
11531153 * held by a route (a destination entry), not by a task.
include/uapi/linux/in.h+1−1
@@ -135,7 +135,7 @@ struct in_addr { · 134 unmodified lines
135135 * this socket to prevent accepting spoofed ones.
136136 */
137137 #define IP_PMTUDISC_INTERFACE 4
138−/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get
138+/* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get
139139 * fragmented if they exeed the interface mtu
140140 */
141141 #define IP_PMTUDISC_OMIT 5
include/uapi/linux/netfilter/nf_tables.h+1−1
@@ -133,7 +133,7 @@ enum nf_tables_msg_types { · 132 unmodified lines
133133 * @NFTA_LIST_ELEM: list element (NLA_NESTED)
134134 */
135135 enum nft_list_attributes {
136− NFTA_LIST_UNPEC,
136+ NFTA_LIST_UNSPEC,
137137 NFTA_LIST_ELEM,
138138 __NFTA_LIST_MAX
139139 };