Merge branch 'kvm-tsx-ctrl' into HEAD

Paolo Bonzini committed 6 years ago

Commit 46f4f0a2 parents 14edff8 b07a5c5928 files · +13793 −4763Browse files

Showing the changes to include/uapi/linux (11 of 928 files). Show all

Unified · Split

11 files

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	1	+/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2	2	/*
3	3	* linux/can.h
4	4	*

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	1	+/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2	2	/*
3	3	* linux/can/bcm.h
4	4	*

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	1	+/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2	2	/*
3	3	* linux/can/error.h
4	4	*

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	1	+/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2	2	/*
3	3	* linux/can/gw.h
4	4	*

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	1	+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2	2	/*
3	3	* j1939.h
4	4	*

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	1	+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2	2	/*
3	3	* linux/can/netlink.h
4	4	*

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	1	+/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */
2	2	/*
3	3	* linux/can/raw.h
4	4	*

@@ -1,4 +1,4 @@
1		−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	1	+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2	2	#ifndef _UAPI_CAN_VXCAN_H
3	3	#define _UAPI_CAN_VXCAN_H
4	4

@@ -38,6 +38,43 @@ · 37 unmodified lines
38	38	*
39	39	* Protocol changelog:
40	40	*
	41	+ * 7.1:
	42	+ * - add the following messages:
	43	+ * FUSE_SETATTR, FUSE_SYMLINK, FUSE_MKNOD, FUSE_MKDIR, FUSE_UNLINK,
	44	+ * FUSE_RMDIR, FUSE_RENAME, FUSE_LINK, FUSE_OPEN, FUSE_READ, FUSE_WRITE,
	45	+ * FUSE_RELEASE, FUSE_FSYNC, FUSE_FLUSH, FUSE_SETXATTR, FUSE_GETXATTR,
	46	+ * FUSE_LISTXATTR, FUSE_REMOVEXATTR, FUSE_OPENDIR, FUSE_READDIR,
	47	+ * FUSE_RELEASEDIR
	48	+ * - add padding to messages to accommodate 32-bit servers on 64-bit kernels
	49	+ *
	50	+ * 7.2:
	51	+ * - add FOPEN_DIRECT_IO and FOPEN_KEEP_CACHE flags
	52	+ * - add FUSE_FSYNCDIR message
	53	+ *
	54	+ * 7.3:
	55	+ * - add FUSE_ACCESS message
	56	+ * - add FUSE_CREATE message
	57	+ * - add filehandle to fuse_setattr_in
	58	+ *
	59	+ * 7.4:
	60	+ * - add frsize to fuse_kstatfs
	61	+ * - clean up request size limit checking
	62	+ *
	63	+ * 7.5:
	64	+ * - add flags and max_write to fuse_init_out
	65	+ *
	66	+ * 7.6:
	67	+ * - add max_readahead to fuse_init_in and fuse_init_out
	68	+ *
	69	+ * 7.7:
	70	+ * - add FUSE_INTERRUPT message
	71	+ * - add POSIX file lock support
	72	+ *
	73	+ * 7.8:
	74	+ * - add lock_owner and flags fields to fuse_release_in
	75	+ * - add FUSE_BMAP message
	76	+ * - add FUSE_DESTROY message
	77	+ *
41	78	* 7.9:
42	79	* - new fuse_getattr_in input argument of GETATTR
43	80	* - add lk_flags in fuse_lk_in

@@ -63,6 +63,7 @@ struct nvme_passthru_cmd64 { · 62 unmodified lines
63	63	__u32 cdw14;
64	64	__u32 cdw15;
65	65	__u32 timeout_ms;
	66	+ __u32 rsvd2;
66	67	__u64 result;
67	68	};
68	69

@@ -51,6 +51,10 @@ · 50 unmodified lines
51	51	* sent when the child exits.
52	52	* @stack: Specify the location of the stack for the
53	53	* child process.
	54	+ * Note, @stack is expected to point to the
	55	+ * lowest address. The stack direction will be
	56	+ * determined by the kernel and set up
	57	+ * appropriately based on @stack_size.
54	58	* @stack_size: The size of the stack for the child process.
55	59	* @tls: If CLONE_SETTLS is set, the tls descriptor
56	60	* is set to tls.