I just landed the fence deadline PR from Rob that a bunch of drivers want/need to apply driver-specific patches. Backmerge -rc4 so that they don't have to be stuck on -rc2 for no reason at all.
Showing the changes to include/uapi (3 of 774 files). Show all
Unified · Split
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */ | |
| 1 | +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ | |
| 2 | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | 3 | /* Documentation/netlink/specs/fou.yaml */ |
| 4 | 4 | /* YNL-GEN uapi header */ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */ | |
| 1 | +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ | |
| 2 | 2 | /* Do not edit directly, auto-generated from: */ |
| 3 | 3 | /* Documentation/netlink/specs/netdev.yaml */ |
| 4 | 4 | /* YNL-GEN uapi header */ |
| @@ -33,6 +33,8 @@ enum netdev_xdp_act { · 28 unmodified lines | ||
| 33 | 33 | NETDEV_XDP_ACT_HW_OFFLOAD = 16, |
| 34 | 34 | NETDEV_XDP_ACT_RX_SG = 32, |
| 35 | 35 | NETDEV_XDP_ACT_NDO_XMIT_SG = 64, |
| 36 | + | |
| 37 | + NETDEV_XDP_ACT_MASK = 127, | |
| 36 | 38 | }; |
| 37 | 39 | |
| 38 | 40 | enum { |
| @@ -789,6 +789,7 @@ enum { · 788 unmodified lines | ||
| 789 | 789 | TCA_ROOT_FLAGS, |
| 790 | 790 | TCA_ROOT_COUNT, |
| 791 | 791 | TCA_ROOT_TIME_DELTA, /* in msecs */ |
| 792 | + TCA_ROOT_EXT_WARN_MSG, | |
| 792 | 793 | __TCA_ROOT_MAX, |
| 793 | 794 | #define TCA_ROOT_MAX (__TCA_ROOT_MAX - 1) |
| 794 | 795 | }; |