Backmerge Linux 5.13-rc7 to make some pulls from later bases apply, and to bake in the conflicts so far.
Showing the changes to include/uapi (6 of 1141 files). Show all
Unified · Split
| @@ -863,8 +863,7 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) · 862 unmodified lines | ||
| 863 | 863 | __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2) |
| 864 | 864 | #define __NR_mount_setattr 442 |
| 865 | 865 | __SYSCALL(__NR_mount_setattr, sys_mount_setattr) |
| 866 | −#define __NR_quotactl_path 443 | |
| 867 | −__SYSCALL(__NR_quotactl_path, sys_quotactl_path) | |
| 866 | +/* 443 is reserved for quotactl_path */ | |
| 868 | 867 | |
| 869 | 868 | #define __NR_landlock_create_ruleset 444 |
| 870 | 869 | __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset) |
| @@ -289,6 +289,9 @@ struct sockaddr_in { · 288 unmodified lines | ||
| 289 | 289 | /* Address indicating an error return. */ |
| 290 | 290 | #define INADDR_NONE ((unsigned long int) 0xffffffff) |
| 291 | 291 | |
| 292 | +/* Dummy address for src of ICMP replies if no real address is set (RFC7600). */ | |
| 293 | +#define INADDR_DUMMY ((unsigned long int) 0xc0000008) | |
| 294 | + | |
| 292 | 295 | /* Network number for local host loopback. */ |
| 293 | 296 | #define IN_LOOPBACKNET 127 |
| 294 | 297 | |
| @@ -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 */ |
| @@ -8,6 +8,7 @@ · 7 unmodified lines | ||
| 8 | 8 | * Note: you must update KVM_API_VERSION if you change this interface. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | +#include <linux/const.h> | |
| 11 | 12 | #include <linux/types.h> |
| 12 | 13 | #include <linux/compiler.h> |
| 13 | 14 | #include <linux/ioctl.h> |
| @@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { · 1865 unmodified lines | ||
| 1879 | 1880 | * conversion after harvesting an entry. Also, it must not skip any |
| 1880 | 1881 | * dirty bits, so that dirty bits are always harvested in sequence. |
| 1881 | 1882 | */ |
| 1882 | −#define KVM_DIRTY_GFN_F_DIRTY BIT(0) | |
| 1883 | −#define KVM_DIRTY_GFN_F_RESET BIT(1) | |
| 1883 | +#define KVM_DIRTY_GFN_F_DIRTY _BITUL(0) | |
| 1884 | +#define KVM_DIRTY_GFN_F_RESET _BITUL(1) | |
| 1884 | 1885 | #define KVM_DIRTY_GFN_F_MASK 0x3 |
| 1885 | 1886 | |
| 1886 | 1887 | /* |
| @@ -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 */ |