Merge tag 'v5.15-rc3' into 'android-mainline'

Linux 5.15-rc3

Resolves merge issue with:
	drivers/scsi/ufs/ufshcd.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1f712bc222c47c2229df00deeddaf5233c69034d
This commit is contained in:
Greg Kroah-Hartman
2021-09-27 11:38:21 +02:00
160 changed files with 1461 additions and 1169 deletions
+7
View File
@@ -273,7 +273,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;
};