History

Merge 6.15-rc6 into usb-next

We need the USB fixes in here as well.

Greg Kroah-Hartman committed 1 year ago

Commit ab6dc9a2 parents 588d032 82f2b0b559 files · +6727 −2990Browse files

Showing the changes to include/uapi (2 of 559 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/bpf.h +3 −0
  2. include/uapi/linux/ethtool_netlink_generated.h +0 −5
include/uapi/linux/bpf.h+3−0
@@ -4968,6 +4968,9 @@ union bpf_attr { · 4967 unmodified lines
49684968 * the netns switch takes place from ingress to ingress without
49694969 * going through the CPU's backlog queue.
49704970 *
4971+ * *skb*\ **->mark** and *skb*\ **->tstamp** are not cleared during
4972+ * the netns switch.
4973+ *
49714974 * The *flags* argument is reserved and must be 0. The helper is
49724975 * currently only supported for tc BPF program types at the
49734976 * ingress hook and for veth and netkit target device types. The
include/uapi/linux/ethtool_netlink_generated.h+0−5
@@ -31,11 +31,6 @@ enum ethtool_header_flags { · 30 unmodified lines
3131 ETHTOOL_FLAG_STATS = 4,
3232 };
3333
34−enum {
35− ETHTOOL_PHY_UPSTREAM_TYPE_MAC,
36− ETHTOOL_PHY_UPSTREAM_TYPE_PHY,
37−};
38−
3934 enum ethtool_tcp_data_split {
4035 ETHTOOL_TCP_DATA_SPLIT_UNKNOWN,
4136 ETHTOOL_TCP_DATA_SPLIT_DISABLED,