History

Merge v6.3-rc4 into drm-next

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.

Daniel Vetter committed 3 years ago

Commit 82bbec12 parents 929ae7c 197b6b6774 files · +8147 −5614Browse files

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

Unified · Split

3 files
  1. include/uapi/linux/fou.h +1 −1
  2. include/uapi/linux/netdev.h +3 −1
  3. include/uapi/linux/rtnetlink.h +1 −0
include/uapi/linux/fou.h+1−1
@@ -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/* Do not edit directly, auto-generated from: */2/* Do not edit directly, auto-generated from: */
3/* Documentation/netlink/specs/fou.yaml */3/* Documentation/netlink/specs/fou.yaml */
4/* YNL-GEN uapi header */4/* YNL-GEN uapi header */
include/uapi/linux/netdev.h+3−1
@@ -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/* Do not edit directly, auto-generated from: */2/* Do not edit directly, auto-generated from: */
3/* Documentation/netlink/specs/netdev.yaml */3/* Documentation/netlink/specs/netdev.yaml */
4/* YNL-GEN uapi header */4/* YNL-GEN uapi header */
@@ -33,6 +33,8 @@ enum netdev_xdp_act { · 28 unmodified lines
33 NETDEV_XDP_ACT_HW_OFFLOAD = 16,33 NETDEV_XDP_ACT_HW_OFFLOAD = 16,
34 NETDEV_XDP_ACT_RX_SG = 32,34 NETDEV_XDP_ACT_RX_SG = 32,
35 NETDEV_XDP_ACT_NDO_XMIT_SG = 64,35 NETDEV_XDP_ACT_NDO_XMIT_SG = 64,
36
37 NETDEV_XDP_ACT_MASK = 127,
36};38};
37 39
38enum {40enum {
include/uapi/linux/rtnetlink.h+1−0
@@ -789,6 +789,7 @@ enum { · 788 unmodified lines
789 TCA_ROOT_FLAGS,789 TCA_ROOT_FLAGS,
790 TCA_ROOT_COUNT,790 TCA_ROOT_COUNT,
791 TCA_ROOT_TIME_DELTA, /* in msecs */791 TCA_ROOT_TIME_DELTA, /* in msecs */
792 TCA_ROOT_EXT_WARN_MSG,
792 __TCA_ROOT_MAX,793 __TCA_ROOT_MAX,
793#define TCA_ROOT_MAX (__TCA_ROOT_MAX - 1)794#define TCA_ROOT_MAX (__TCA_ROOT_MAX - 1)
794};795};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t