diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-09-22 18:32:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-09-22 18:35:06 +1000 |
| commit | b0a3a811634aa7422f8a92196db47a06a70bda16 (patch) | |
| tree | 15f8b05b9a0e99e87fecb6751a0a9ef59589c28c /include/uapi | |
| parent | 014ee7742bed896f1aee13ecdee5fe8c7826c0a1 (diff) | |
| parent | 93f51579e7df248780214094418f205253383cc5 (diff) | |
Backmerge tag 'v7.3-rc4' into drm-next
Linux 7.3-rc4
Requested by Philipp Stanner for
2ab510e63197360945f915dd5631a77c63ac6b27 would be needed as a groundlayer
for further patches that extend the locking in drm_sched
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 6 | ||||
| -rw-r--r-- | include/uapi/rdma/bnxt_re-abi.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 3528168f7c6d..4217950e5d16 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -970,6 +970,12 @@ /* * LEDs + * + * Do not add any new LED definitions to the input subsystem. The existing + * definitions are legacy and grandfathered for backwards compatibility with + * userspace (via evdev). Any new LEDs should be implemented using the + * LED subsystem (struct led_classdev). The input core provides a bridge to + * the LED subsystem in drivers/input/input-leds.c. */ #define LED_NUML 0x00 diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h index 856a1b3036e9..15ed2a51f8f1 100644 --- a/include/uapi/rdma/bnxt_re-abi.h +++ b/include/uapi/rdma/bnxt_re-abi.h @@ -250,7 +250,7 @@ struct bnxt_re_query_device_ex_resp { struct bnxt_re_db_region { __u32 dpi; __u32 reserved; - __aligned_u64 umdbr; + __aligned_u64 reserved2; }; enum bnxt_re_obj_dbr_alloc_attrs { |