History

Merge 5.15-rc6 into char-misc-next

We need the char/misc fixes in here for merging and testing.

Greg Kroah-Hartman committed 5 years ago

Commit 22d4f9b2 parents d0221a7 519d819648 files · +7117 −4345Browse files

Showing the changes to include/uapi (3 of 648 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/hyperv.h +1 −1
  2. include/uapi/linux/xfrm.h +9 −6
  3. include/uapi/misc/habanalabs.h +2 −4
include/uapi/linux/hyperv.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26#ifndef _UAPI_HYPERV_H26#ifndef _UAPI_HYPERV_H
27#define _UAPI_HYPERV_H27#define _UAPI_HYPERV_H
28 28
29#include <linux/uuid.h>29#include <linux/types.h>
30 30
31/*31/*
32 * Framework version for util services.32 * Framework version for util services.
include/uapi/linux/xfrm.h+9−6
@@ -213,13 +213,13 @@ enum { · 212 unmodified lines
213 XFRM_MSG_GETSPDINFO,213 XFRM_MSG_GETSPDINFO,
214#define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO214#define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO
215 215
216 XFRM_MSG_MAPPING,
217#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
218
216 XFRM_MSG_SETDEFAULT,219 XFRM_MSG_SETDEFAULT,
217#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT220#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT
218 XFRM_MSG_GETDEFAULT,221 XFRM_MSG_GETDEFAULT,
219#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT222#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT
220
221 XFRM_MSG_MAPPING,
222#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
223 __XFRM_MSG_MAX223 __XFRM_MSG_MAX
224};224};
225#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)225#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -514,9 +514,12 @@ struct xfrm_user_offload { · 288 unmodified lines
514#define XFRM_OFFLOAD_INBOUND 2514#define XFRM_OFFLOAD_INBOUND 2
515 515
516struct xfrm_userpolicy_default {516struct xfrm_userpolicy_default {
517#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8)517#define XFRM_USERPOLICY_UNSPEC 0
518 __u8 dirmask;518#define XFRM_USERPOLICY_BLOCK 1
519 __u8 action;519#define XFRM_USERPOLICY_ACCEPT 2
520 __u8 in;
521 __u8 fwd;
522 __u8 out;
520};523};
521 524
522#ifndef __KERNEL__525#ifndef __KERNEL__
include/uapi/misc/habanalabs.h+2−4
@@ -917,7 +917,6 @@ struct hl_wait_cs_in { · 916 unmodified lines
917#define HL_WAIT_CS_STATUS_BUSY 1917#define HL_WAIT_CS_STATUS_BUSY 1
918#define HL_WAIT_CS_STATUS_TIMEDOUT 2918#define HL_WAIT_CS_STATUS_TIMEDOUT 2
919#define HL_WAIT_CS_STATUS_ABORTED 3919#define HL_WAIT_CS_STATUS_ABORTED 3
920#define HL_WAIT_CS_STATUS_INTERRUPTED 4
921 920
922#define HL_WAIT_CS_STATUS_FLAG_GONE 0x1921#define HL_WAIT_CS_STATUS_FLAG_GONE 0x1
923#define HL_WAIT_CS_STATUS_FLAG_TIMESTAMP_VLD 0x2922#define HL_WAIT_CS_STATUS_FLAG_TIMESTAMP_VLD 0x2
@@ -1286,7 +1285,8 @@ struct hl_debug_args { · 362 unmodified lines
1286 * EIO - The CS was aborted (usually because the device was reset)1285 * EIO - The CS was aborted (usually because the device was reset)
1287 * ENODEV - The device wants to do hard-reset (so user need to close FD)1286 * ENODEV - The device wants to do hard-reset (so user need to close FD)
1288 *1287 *
1289 * The driver also returns a custom define inside the IOCTL which can be:1288 * The driver also returns a custom define in case the IOCTL call returned 0.
1289 * The define can be one of the following:
1290 *1290 *
1291 * HL_WAIT_CS_STATUS_COMPLETED - The CS has been completed successfully (0)1291 * HL_WAIT_CS_STATUS_COMPLETED - The CS has been completed successfully (0)
1292 * HL_WAIT_CS_STATUS_BUSY - The CS is still executing (0)1292 * HL_WAIT_CS_STATUS_BUSY - The CS is still executing (0)
@@ -1294,8 +1294,6 @@ struct hl_debug_args { · 1 unmodified line
1294 * (ETIMEDOUT)1294 * (ETIMEDOUT)
1295 * HL_WAIT_CS_STATUS_ABORTED - The CS was aborted, usually because the1295 * HL_WAIT_CS_STATUS_ABORTED - The CS was aborted, usually because the
1296 * device was reset (EIO)1296 * device was reset (EIO)
1297 * HL_WAIT_CS_STATUS_INTERRUPTED - Waiting for the CS was interrupted (EINTR)
1298 *
1299 */1297 */
1300 1298
1301#define HL_IOCTL_WAIT_CS \1299#define HL_IOCTL_WAIT_CS \