History

BackMerge tag 'v5.15-rc7' into drm-next

The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.

Dave Airlie committed 5 years ago

Commit 970eae12 parents 27f4432 3906fe91437 files · +16472 −9320Browse files

Showing the changes to include/uapi (7 of 1437 files). Show all

Unified · Split

7 files
  1. include/uapi/linux/android/binder.h +7 −0
  2. include/uapi/linux/cifs/cifs_mount.h +0 −1
  3. include/uapi/linux/hyperv.h +1 −1
  4. include/uapi/linux/mctp.h +5 −2
  5. include/uapi/linux/xfrm.h +9 −6
  6. include/uapi/misc/habanalabs.h +2 −4
  7. include/uapi/sound/asound.h +1 −0
include/uapi/linux/android/binder.h+7−0
@@ -225,7 +225,14 @@ struct binder_freeze_info { · 224 unmodified lines
225 225
226struct binder_frozen_status_info {226struct binder_frozen_status_info {
227 __u32 pid;227 __u32 pid;
228
229 /* process received sync transactions since last frozen
230 * bit 0: received sync transaction after being frozen
231 * bit 1: new pending sync transaction during freezing
232 */
228 __u32 sync_recv;233 __u32 sync_recv;
234
235 /* process received async transactions since last frozen */
229 __u32 async_recv;236 __u32 async_recv;
230};237};
231 238
include/uapi/linux/cifs/cifs_mount.h+0−1
@@ -1,6 +1,5 @@
1/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */1/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
2/*2/*
3 * include/uapi/linux/cifs/cifs_mount.h
4 *3 *
5 * Author(s): Scott Lovenberg (scott.lovenberg@gmail.com)4 * Author(s): Scott Lovenberg (scott.lovenberg@gmail.com)
6 *5 *
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/mctp.h+5−2
@@ -10,6 +10,7 @@ · 9 unmodified lines
10#define __UAPI_MCTP_H10#define __UAPI_MCTP_H
11 11
12#include <linux/types.h>12#include <linux/types.h>
13#include <linux/socket.h>
13 14
14typedef __u8 mctp_eid_t;15typedef __u8 mctp_eid_t;
15 16
@@ -18,11 +19,13 @@ struct mctp_addr { · 2 unmodified lines
18};19};
19 20
20struct sockaddr_mctp {21struct sockaddr_mctp {
21 unsigned short int smctp_family;22 __kernel_sa_family_t smctp_family;
22 int smctp_network;23 __u16 __smctp_pad0;
24 unsigned int smctp_network;
23 struct mctp_addr smctp_addr;25 struct mctp_addr smctp_addr;
24 __u8 smctp_type;26 __u8 smctp_type;
25 __u8 smctp_tag;27 __u8 smctp_tag;
28 __u8 __smctp_pad1;
26};29};
27 30
28#define MCTP_NET_ANY 0x031#define MCTP_NET_ANY 0x0
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 \
include/uapi/sound/asound.h+1−0
@@ -784,6 +784,7 @@ struct snd_rawmidi_status { · 783 unmodified lines
784 784
785#define SNDRV_RAWMIDI_IOCTL_PVERSION _IOR('W', 0x00, int)785#define SNDRV_RAWMIDI_IOCTL_PVERSION _IOR('W', 0x00, int)
786#define SNDRV_RAWMIDI_IOCTL_INFO _IOR('W', 0x01, struct snd_rawmidi_info)786#define SNDRV_RAWMIDI_IOCTL_INFO _IOR('W', 0x01, struct snd_rawmidi_info)
787#define SNDRV_RAWMIDI_IOCTL_USER_PVERSION _IOW('W', 0x02, int)
787#define SNDRV_RAWMIDI_IOCTL_PARAMS _IOWR('W', 0x10, struct snd_rawmidi_params)788#define SNDRV_RAWMIDI_IOCTL_PARAMS _IOWR('W', 0x10, struct snd_rawmidi_params)
788#define SNDRV_RAWMIDI_IOCTL_STATUS _IOWR('W', 0x20, struct snd_rawmidi_status)789#define SNDRV_RAWMIDI_IOCTL_STATUS _IOWR('W', 0x20, struct snd_rawmidi_status)
789#define SNDRV_RAWMIDI_IOCTL_DROP _IOW('W', 0x30, int)790#define SNDRV_RAWMIDI_IOCTL_DROP _IOW('W', 0x30, int)