History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there.

Jakub Kicinski committed 5 years ago

Commit adc2e562 parents 4bea720 9ed13a1858 files · +9167 −4041Browse files

Showing the changes to include/uapi (5 of 858 files). Show all

Unified · Split

5 files
  1. include/uapi/asm-generic/unistd.h +1 −2
  2. include/uapi/linux/in.h +3 −0
  3. include/uapi/linux/input-event-codes.h +1 −0
  4. include/uapi/linux/io_uring.h +10 −9
  5. include/uapi/linux/kvm.h +3 −2
include/uapi/asm-generic/unistd.h+1−2
@@ -863,8 +863,7 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) · 862 unmodified lines
863__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)863__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)
864#define __NR_mount_setattr 442864#define __NR_mount_setattr 442
865__SYSCALL(__NR_mount_setattr, sys_mount_setattr)865__SYSCALL(__NR_mount_setattr, sys_mount_setattr)
866#define __NR_quotactl_path 443866/* 443 is reserved for quotactl_path */
867__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
868 867
869#define __NR_landlock_create_ruleset 444868#define __NR_landlock_create_ruleset 444
870__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)869__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
include/uapi/linux/in.h+3−0
@@ -289,6 +289,9 @@ struct sockaddr_in { · 288 unmodified lines
289/* Address indicating an error return. */289/* Address indicating an error return. */
290#define INADDR_NONE ((unsigned long int) 0xffffffff)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/* Network number for local host loopback. */295/* Network number for local host loopback. */
293#define IN_LOOPBACKNET 127296#define IN_LOOPBACKNET 127
294 297
include/uapi/linux/input-event-codes.h+1−0
@@ -611,6 +611,7 @@ · 610 unmodified lines
611#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */611#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */
612#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */612#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */
613#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */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#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */616#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
616#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */617#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
include/uapi/linux/io_uring.h+10−9
@@ -280,6 +280,7 @@ struct io_uring_params { · 279 unmodified lines
280#define IORING_FEAT_SQPOLL_NONFIXED (1U << 7)280#define IORING_FEAT_SQPOLL_NONFIXED (1U << 7)
281#define IORING_FEAT_EXT_ARG (1U << 8)281#define IORING_FEAT_EXT_ARG (1U << 8)
282#define IORING_FEAT_NATIVE_WORKERS (1U << 9)282#define IORING_FEAT_NATIVE_WORKERS (1U << 9)
283#define IORING_FEAT_RSRC_TAGS (1U << 10)
283 284
284/*285/*
285 * io_uring_register(2) opcodes and arguments286 * io_uring_register(2) opcodes and arguments
@@ -298,8 +299,12 @@ enum { · 12 unmodified lines
298 IORING_UNREGISTER_PERSONALITY = 10,299 IORING_UNREGISTER_PERSONALITY = 10,
299 IORING_REGISTER_RESTRICTIONS = 11,300 IORING_REGISTER_RESTRICTIONS = 11,
300 IORING_REGISTER_ENABLE_RINGS = 12,301 IORING_REGISTER_ENABLE_RINGS = 12,
301 IORING_REGISTER_RSRC = 13,302
302 IORING_REGISTER_RSRC_UPDATE = 14,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 /* this goes last */309 /* this goes last */
305 IORING_REGISTER_LAST310 IORING_REGISTER_LAST
@@ -312,14 +317,10 @@ struct io_uring_files_update { · 6 unmodified lines
312 __aligned_u64 /* __s32 * */ fds;317 __aligned_u64 /* __s32 * */ fds;
313};318};
314 319
315enum {
316 IORING_RSRC_FILE = 0,
317 IORING_RSRC_BUFFER = 1,
318};
319
320struct io_uring_rsrc_register {320struct io_uring_rsrc_register {
321 __u32 type;
322 __u32 nr;321 __u32 nr;
322 __u32 resv;
323 __u64 resv2;
323 __aligned_u64 data;324 __aligned_u64 data;
324 __aligned_u64 tags;325 __aligned_u64 tags;
325};326};
@@ -335,8 +336,8 @@ struct io_uring_rsrc_update2 { · 9 unmodified lines
335 __u32 resv;336 __u32 resv;
336 __aligned_u64 data;337 __aligned_u64 data;
337 __aligned_u64 tags;338 __aligned_u64 tags;
338 __u32 type;
339 __u32 nr;339 __u32 nr;
340 __u32 resv2;
340};341};
341 342
342/* Skip updating fd indexes set to this value in the fd table */343/* Skip updating fd indexes set to this value in the fd table */
include/uapi/linux/kvm.h+3−2
@@ -8,6 +8,7 @@ · 7 unmodified lines
8 * Note: you must update KVM_API_VERSION if you change this interface.8 * Note: you must update KVM_API_VERSION if you change this interface.
9 */9 */
10 10
11#include <linux/const.h>
11#include <linux/types.h>12#include <linux/types.h>
12#include <linux/compiler.h>13#include <linux/compiler.h>
13#include <linux/ioctl.h>14#include <linux/ioctl.h>
@@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { · 1865 unmodified lines
1879 * conversion after harvesting an entry. Also, it must not skip any1880 * conversion after harvesting an entry. Also, it must not skip any
1880 * dirty bits, so that dirty bits are always harvested in sequence.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_DIRTY _BITUL(0)
1883#define KVM_DIRTY_GFN_F_RESET BIT(1)1884#define KVM_DIRTY_GFN_F_RESET _BITUL(1)
1884#define KVM_DIRTY_GFN_F_MASK 0x31885#define KVM_DIRTY_GFN_F_MASK 0x3
1885 1886
1886/*1887/*