We need the fixes in here as well.
Showing the changes to include/uapi (3 of 520 files). Show all
Unified · Split
| @@ -611,6 +611,7 @@ · 610 unmodified lines | ||
| 611 | 611 | #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ |
| 612 | 612 | #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ |
| 613 | 613 | #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ |
| 614 | +#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ | |
| 614 | 615 | |
| 615 | 616 | #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ |
| 616 | 617 | #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ |
| @@ -280,6 +280,7 @@ struct io_uring_params { · 279 unmodified lines | ||
| 280 | 280 | #define IORING_FEAT_SQPOLL_NONFIXED (1U << 7) |
| 281 | 281 | #define IORING_FEAT_EXT_ARG (1U << 8) |
| 282 | 282 | #define IORING_FEAT_NATIVE_WORKERS (1U << 9) |
| 283 | +#define IORING_FEAT_RSRC_TAGS (1U << 10) | |
| 283 | 284 | |
| 284 | 285 | /* |
| 285 | 286 | * io_uring_register(2) opcodes and arguments |
| @@ -298,8 +299,12 @@ enum { · 12 unmodified lines | ||
| 298 | 299 | IORING_UNREGISTER_PERSONALITY = 10, |
| 299 | 300 | IORING_REGISTER_RESTRICTIONS = 11, |
| 300 | 301 | IORING_REGISTER_ENABLE_RINGS = 12, |
| 301 | − IORING_REGISTER_RSRC = 13, | |
| 302 | − IORING_REGISTER_RSRC_UPDATE = 14, | |
| 302 | + | |
| 303 | + /* extended with tagging */ | |
| 304 | + IORING_REGISTER_FILES2 = 13, | |
| 305 | + IORING_REGISTER_FILES_UPDATE2 = 14, | |
| 306 | + IORING_REGISTER_BUFFERS2 = 15, | |
| 307 | + IORING_REGISTER_BUFFERS_UPDATE = 16, | |
| 303 | 308 | |
| 304 | 309 | /* this goes last */ |
| 305 | 310 | IORING_REGISTER_LAST |
| @@ -312,14 +317,10 @@ struct io_uring_files_update { · 6 unmodified lines | ||
| 312 | 317 | __aligned_u64 /* __s32 * */ fds; |
| 313 | 318 | }; |
| 314 | 319 | |
| 315 | −enum { | |
| 316 | − IORING_RSRC_FILE = 0, | |
| 317 | − IORING_RSRC_BUFFER = 1, | |
| 318 | −}; | |
| 319 | − | |
| 320 | 320 | struct io_uring_rsrc_register { |
| 321 | − __u32 type; | |
| 322 | 321 | __u32 nr; |
| 322 | + __u32 resv; | |
| 323 | + __u64 resv2; | |
| 323 | 324 | __aligned_u64 data; |
| 324 | 325 | __aligned_u64 tags; |
| 325 | 326 | }; |
| @@ -335,8 +336,8 @@ struct io_uring_rsrc_update2 { · 9 unmodified lines | ||
| 335 | 336 | __u32 resv; |
| 336 | 337 | __aligned_u64 data; |
| 337 | 338 | __aligned_u64 tags; |
| 338 | − __u32 type; | |
| 339 | 339 | __u32 nr; |
| 340 | + __u32 resv2; | |
| 340 | 341 | }; |
| 341 | 342 | |
| 342 | 343 | /* Skip updating fd indexes set to this value in the fd table */ |
| @@ -54,7 +54,7 @@ · 53 unmodified lines | ||
| 54 | 54 | #define VIRTIO_ID_SOUND 25 /* virtio sound */ |
| 55 | 55 | #define VIRTIO_ID_FS 26 /* virtio filesystem */ |
| 56 | 56 | #define VIRTIO_ID_PMEM 27 /* virtio pmem */ |
| 57 | −#define VIRTIO_ID_BT 28 /* virtio bluetooth */ | |
| 58 | 57 | #define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */ |
| 58 | +#define VIRTIO_ID_BT 40 /* virtio bluetooth */ | |
| 59 | 59 | |
| 60 | 60 | #endif /* _LINUX_VIRTIO_IDS_H */ |