History

Merge 6.11-rc7 into usb-next

We need the USB fixes in here as well, and this also resolves the merge conflict in: drivers/usb/typec/ucsi/ucsi.c

Greg Kroah-Hartman committed 2 years ago

Commit f299cd12 parents 9c0c11b da3ea35354 files · +3174 −1896Browse files

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

Unified · Split

2 files
  1. include/uapi/drm/panthor_drm.h +5 −1
  2. include/uapi/sound/sof/abi.h +1 −1
include/uapi/drm/panthor_drm.h+5−1
@@ -692,7 +692,11 @@ enum drm_panthor_group_priority { · 691 unmodified lines
692 /** @PANTHOR_GROUP_PRIORITY_MEDIUM: Medium priority group. */692 /** @PANTHOR_GROUP_PRIORITY_MEDIUM: Medium priority group. */
693 PANTHOR_GROUP_PRIORITY_MEDIUM,693 PANTHOR_GROUP_PRIORITY_MEDIUM,
694 694
695 /** @PANTHOR_GROUP_PRIORITY_HIGH: High priority group. */695 /**
696 * @PANTHOR_GROUP_PRIORITY_HIGH: High priority group.
697 *
698 * Requires CAP_SYS_NICE or DRM_MASTER.
699 */
696 PANTHOR_GROUP_PRIORITY_HIGH,700 PANTHOR_GROUP_PRIORITY_HIGH,
697};701};
698 702
include/uapi/sound/sof/abi.h+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29/* SOF ABI version major, minor and patch numbers */29/* SOF ABI version major, minor and patch numbers */
30#define SOF_ABI_MAJOR 330#define SOF_ABI_MAJOR 3
31#define SOF_ABI_MINOR 2331#define SOF_ABI_MINOR 23
32#define SOF_ABI_PATCH 032#define SOF_ABI_PATCH 1
33 33
34/* SOF ABI version number. Format within 32bit word is MMmmmppp */34/* SOF ABI version number. Format within 32bit word is MMmmmppp */
35#define SOF_ABI_MAJOR_SHIFT 2435#define SOF_ABI_MAJOR_SHIFT 24