diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
| commit | 5fe7bd5a37ff0d77936f8e38313db5da2dd53f70 (patch) | |
| tree | 5012e70d0993aa23466e06012d2bfb98ba04aa29 /include/uapi | |
| parent | 48a78c66ad5d9d4f918182335d6e5726e7008085 (diff) | |
| parent | 67a12ae52599c9f2f24ef14adb43fc3b164792b5 (diff) | |
| download | cachepc-linux-5fe7bd5a37ff0d77936f8e38313db5da2dd53f70.tar.gz cachepc-linux-5fe7bd5a37ff0d77936f8e38313db5da2dd53f70.zip | |
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/android/binder.h | 7 | ||||
| -rw-r--r-- | include/uapi/linux/cifs/cifs_mount.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h index 20e435fe657a..3246f2c74696 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -225,7 +225,14 @@ struct binder_freeze_info { struct binder_frozen_status_info { __u32 pid; + + /* process received sync transactions since last frozen + * bit 0: received sync transaction after being frozen + * bit 1: new pending sync transaction during freezing + */ __u32 sync_recv; + + /* process received async transactions since last frozen */ __u32 async_recv; }; diff --git a/include/uapi/linux/cifs/cifs_mount.h b/include/uapi/linux/cifs/cifs_mount.h index 69829205fdb5..8e87d27b0951 100644 --- a/include/uapi/linux/cifs/cifs_mount.h +++ b/include/uapi/linux/cifs/cifs_mount.h @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */ /* - * include/uapi/linux/cifs/cifs_mount.h * * Author(s): Scott Lovenberg (scott.lovenberg@gmail.com) * |