Merge changes I84e3e7ab,Ia2272b4c,If8769655,Ida1f7b9a into main

* changes:
  aosp/android-mainline: update series (rebase onto v6.7-rc8-53-g08bd31ece0820)
  aosp/android-mainline: update series (rebase onto v6.7-rc8)
  aosp/android-mainline: update series (rebase onto v6.7-rc7)
  aosp/android-mainline: update series (rebase onto v6.7-rc6)

22 files changed, 61 insertions, 61 deletions

diff --git a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch
index e9fb4bc9..abb52562 100644
--- a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch
+++ b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch
@@ -230,7 +230,7 @@ new file mode 100644
 diff --git a/MAINTAINERS b/MAINTAINERS
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -10369,6 +10369,13 @@ F:	Documentation/hwmon/ina2xx.rst
+@@ -10375,6 +10375,13 @@ F:	Documentation/hwmon/ina2xx.rst
  F:	drivers/hwmon/ina2xx.c
  F:	include/linux/platform_data/ina2xx.h
  
diff --git a/android-mainline/ANDROID-Revert-perf-core-Use-static_call-to-optimize-perf_guest_info_callbacks.patch b/android-mainline/ANDROID-Revert-perf-core-Use-static_call-to-optimize-perf_guest_info_callbacks.patch
index 95ee1dc3..f30596dd 100644
--- a/android-mainline/ANDROID-Revert-perf-core-Use-static_call-to-optimize-perf_guest_info_callbacks.patch
+++ b/android-mainline/ANDROID-Revert-perf-core-Use-static_call-to-optimize-perf_guest_info_callbacks.patch
@@ -106,7 +106,7 @@ diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
 diff --git a/kernel/events/core.c b/kernel/events/core.c
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -6820,23 +6820,12 @@ static void perf_pending_task(struct callback_head *head)
+@@ -6830,23 +6830,12 @@ static void perf_pending_task(struct callback_head *head)
  #ifdef CONFIG_GUEST_PERF_EVENTS
  struct perf_guest_info_callbacks __rcu *perf_guest_cbs;
  
@@ -130,7 +130,7 @@ diff --git a/kernel/events/core.c b/kernel/events/core.c
  }
  EXPORT_SYMBOL_GPL(perf_register_guest_info_callbacks);
  
-@@ -6846,10 +6835,6 @@ void perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *cbs)
+@@ -6856,10 +6845,6 @@ void perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *cbs)
  		return;
  
  	rcu_assign_pointer(perf_guest_cbs, NULL);
diff --git a/android-mainline/ANDROID-dm-dm-user-New-target-that-proxies-BIOs-to-userspace.patch b/android-mainline/ANDROID-dm-dm-user-New-target-that-proxies-BIOs-to-userspace.patch
index 616ae792..262cd597 100644
--- a/android-mainline/ANDROID-dm-dm-user-New-target-that-proxies-BIOs-to-userspace.patch
+++ b/android-mainline/ANDROID-dm-dm-user-New-target-that-proxies-BIOs-to-userspace.patch
@@ -36,7 +36,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
 --- a/drivers/md/Kconfig
 +++ b/drivers/md/Kconfig
-@@ -688,4 +688,18 @@ config DM_AUDIT
+@@ -689,4 +689,18 @@ config DM_AUDIT
  	  Enables audit logging of several security relevant events in the
  	  particular device-mapper targets, especially the integrity target.
  
diff --git a/android-mainline/ANDROID-fs-fuse-Use-extended-init-flags-for-FUSE_PASSTHROUGH.patch b/android-mainline/ANDROID-fs-fuse-Use-extended-init-flags-for-FUSE_PASSTHROUGH.patch
index 0698aec7..192f6bb3 100644
--- a/android-mainline/ANDROID-fs-fuse-Use-extended-init-flags-for-FUSE_PASSTHROUGH.patch
+++ b/android-mainline/ANDROID-fs-fuse-Use-extended-init-flags-for-FUSE_PASSTHROUGH.patch
@@ -33,7 +33,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
 --- a/fs/fuse/inode.c
 +++ b/fs/fuse/inode.c
-@@ -1296,6 +1296,8 @@ void fuse_send_init(struct fuse_mount *fm)
+@@ -1348,6 +1348,8 @@ void fuse_send_init(struct fuse_mount *fm)
  	if (fm->fc->auto_submounts)
  		flags |= FUSE_SUBMOUNTS;
  
@@ -92,9 +92,9 @@ diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c
 diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
 --- a/include/uapi/linux/fuse.h
 +++ b/include/uapi/linux/fuse.h
-@@ -451,6 +451,18 @@ struct fuse_file_lock {
- #define FUSE_HAS_EXPIRE_ONLY	(1ULL << 35)
- #define FUSE_DIRECT_IO_RELAX	(1ULL << 36)
+@@ -453,6 +453,18 @@ struct fuse_file_lock {
+ /* Obsolete alias for FUSE_DIRECT_IO_ALLOW_MMAP */
+ #define FUSE_DIRECT_IO_RELAX	FUSE_DIRECT_IO_ALLOW_MMAP
  
 +/*
 + * For FUSE < 7.36 FUSE_PASSTHROUGH has value (1 << 31).
diff --git a/android-mainline/ANDROID-fuse-Add-support-for-d_canonical_path.patch b/android-mainline/ANDROID-fuse-Add-support-for-d_canonical_path.patch
index 7acf6b16..640e9024 100644
--- a/android-mainline/ANDROID-fuse-Add-support-for-d_canonical_path.patch
+++ b/android-mainline/ANDROID-fuse-Add-support-for-d_canonical_path.patch
@@ -111,7 +111,7 @@ diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 --- a/fs/fuse/fuse_i.h
 +++ b/fs/fuse/fuse_i.h
-@@ -285,6 +285,9 @@ struct fuse_args {
+@@ -300,6 +300,9 @@ struct fuse_args {
  	struct fuse_in_arg in_args[3];
  	struct fuse_arg out_args[2];
  	void (*end)(struct fuse_mount *fm, struct fuse_args *args, int error);
@@ -121,7 +121,7 @@ diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
  };
  
  struct fuse_args_pages {
-@@ -1362,8 +1365,7 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff,
+@@ -1377,8 +1380,7 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff,
  		       unsigned int open_flags, fl_owner_t id, bool isdir);
  
  /* passthrough.c */
@@ -160,7 +160,7 @@ diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c
 diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
 --- a/include/uapi/linux/fuse.h
 +++ b/include/uapi/linux/fuse.h
-@@ -629,6 +629,7 @@ enum fuse_opcode {
+@@ -631,6 +631,7 @@ enum fuse_opcode {
  	FUSE_SYNCFS		= 50,
  	FUSE_TMPFILE		= 51,
  	FUSE_STATX		= 52,
@@ -168,7 +168,7 @@ diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
  
  	/* CUSE specific operations */
  	CUSE_INIT		= 4096,
-@@ -982,14 +983,6 @@ struct fuse_in_header {
+@@ -984,14 +985,6 @@ struct fuse_in_header {
  	uint16_t	padding;
  };
  
@@ -183,7 +183,7 @@ diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
  struct fuse_out_header {
  	uint32_t	len;
  	int32_t		error;
-@@ -1070,8 +1063,9 @@ struct fuse_notify_retrieve_in {
+@@ -1072,8 +1065,9 @@ struct fuse_notify_retrieve_in {
  /* Device ioctls: */
  #define FUSE_DEV_IOC_MAGIC		229
  #define FUSE_DEV_IOC_CLONE		_IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)
diff --git a/android-mainline/ANDROID-mm-Memory-health-driver.patch b/android-mainline/ANDROID-mm-Memory-health-driver.patch
index dbbdf83a..0aca3fd0 100644
--- a/android-mainline/ANDROID-mm-Memory-health-driver.patch
+++ b/android-mainline/ANDROID-mm-Memory-health-driver.patch
@@ -550,7 +550,7 @@ diff --git a/mm/oom_kill.c b/mm/oom_kill.c
 diff --git a/mm/vmscan.c b/mm/vmscan.c
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
-@@ -6388,6 +6388,13 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
+@@ -6418,6 +6418,13 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
  	return nr_reclaimed;
  }
  
diff --git a/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch b/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch
index 848deb54..fadf3e59 100644
--- a/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch
+++ b/android-mainline/ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch
@@ -69,7 +69,7 @@ diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
 diff --git a/include/net/addrconf.h b/include/net/addrconf.h
 --- a/include/net/addrconf.h
 +++ b/include/net/addrconf.h
-@@ -271,6 +271,18 @@ static inline bool ipv6_is_mld(struct sk_buff *skb, int nexthdr, int offset)
+@@ -279,6 +279,18 @@ static inline bool ipv6_is_mld(struct sk_buff *skb, int nexthdr, int offset)
  void addrconf_prefix_rcv(struct net_device *dev,
  			 u8 *opt, int len, bool sllao);
  
@@ -152,7 +152,7 @@ diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
  
  	table = fib6_get_table(dev_net(dev), tb_id);
  	if (!table)
-@@ -6899,6 +6921,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -6895,6 +6917,13 @@ static const struct ctl_table addrconf_sysctl[] = {
  	},
  #endif
  #endif
diff --git a/android-mainline/ANDROID-overlayfs-override_creds-off-option-bypass-creator_cred.patch b/android-mainline/ANDROID-overlayfs-override_creds-off-option-bypass-creator_cred.patch
index f4894eb1..2029a353 100644
--- a/android-mainline/ANDROID-overlayfs-override_creds-off-option-bypass-creator_cred.patch
+++ b/android-mainline/ANDROID-overlayfs-override_creds-off-option-bypass-creator_cred.patch
@@ -93,7 +93,7 @@ diff --git a/Documentation/filesystems/overlayfs.rst b/Documentation/filesystems
 diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
 --- a/fs/overlayfs/copy_up.c
 +++ b/fs/overlayfs/copy_up.c
-@@ -1195,7 +1195,7 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)
+@@ -1196,7 +1196,7 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)
  		dput(parent);
  		dput(next);
  	}
diff --git a/android-mainline/ANDROID-scsi-ufs-add-UFSHCD_ANDROID_QUIRK_KEYS_IN_PRDT.patch b/android-mainline/ANDROID-scsi-ufs-add-UFSHCD_ANDROID_QUIRK_KEYS_IN_PRDT.patch
index 2c729a25..788388a2 100644
--- a/android-mainline/ANDROID-scsi-ufs-add-UFSHCD_ANDROID_QUIRK_KEYS_IN_PRDT.patch
+++ b/android-mainline/ANDROID-scsi-ufs-add-UFSHCD_ANDROID_QUIRK_KEYS_IN_PRDT.patch
@@ -59,7 +59,7 @@ diff --git a/drivers/ufs/core/ufshcd-crypto.h b/drivers/ufs/core/ufshcd-crypto.h
 diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
 --- a/drivers/ufs/core/ufshcd.c
 +++ b/drivers/ufs/core/ufshcd.c
-@@ -5467,6 +5467,7 @@ void ufshcd_release_scsi_cmd(struct ufs_hba *hba,
+@@ -5468,6 +5468,7 @@ void ufshcd_release_scsi_cmd(struct ufs_hba *hba,
  	struct scsi_cmnd *cmd = lrbp->cmd;
  
  	scsi_dma_unmap(cmd);
diff --git a/android-mainline/FROMLIST-Revert-fuse-Apply-flags2-only-when-userspace-set-the-FUSE_INIT_EXT.patch b/android-mainline/FROMLIST-Revert-fuse-Apply-flags2-only-when-userspace-set-the-FUSE_INIT_EXT.patch
index 91f327e8..f2e08e74 100644
--- a/android-mainline/FROMLIST-Revert-fuse-Apply-flags2-only-when-userspace-set-the-FUSE_INIT_EXT.patch
+++ b/android-mainline/FROMLIST-Revert-fuse-Apply-flags2-only-when-userspace-set-the-FUSE_INIT_EXT.patch
@@ -31,7 +31,7 @@ Signed-off-by: André Draszik <draszik@google.com>
 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
 --- a/fs/fuse/inode.c
 +++ b/fs/fuse/inode.c
-@@ -1154,10 +1154,7 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,
+@@ -1206,10 +1206,7 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,
  		process_init_limits(fc, arg);
  
  		if (arg->minor >= 6) {
diff --git a/android-mainline/FROMLIST-fuse-Allocate-unlikely-used-ioctl-number-for-passthrough-V1.patch b/android-mainline/FROMLIST-fuse-Allocate-unlikely-used-ioctl-number-for-passthrough-V1.patch
index a53b8b44..a9da4ca5 100644
--- a/android-mainline/FROMLIST-fuse-Allocate-unlikely-used-ioctl-number-for-passthrough-V1.patch
+++ b/android-mainline/FROMLIST-fuse-Allocate-unlikely-used-ioctl-number-for-passthrough-V1.patch
@@ -26,7 +26,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
 --- a/include/uapi/linux/fuse.h
 +++ b/include/uapi/linux/fuse.h
-@@ -970,6 +970,7 @@ struct fuse_in_header {
+@@ -972,6 +972,7 @@ struct fuse_in_header {
  	uint16_t	padding;
  };
  
@@ -34,7 +34,7 @@ diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
  struct fuse_passthrough_out {
  	uint32_t	fd;
  	/* For future implementation */
-@@ -1057,7 +1058,8 @@ struct fuse_notify_retrieve_in {
+@@ -1059,7 +1060,8 @@ struct fuse_notify_retrieve_in {
  /* Device ioctls: */
  #define FUSE_DEV_IOC_MAGIC		229
  #define FUSE_DEV_IOC_CLONE		_IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)
diff --git a/android-mainline/FROMLIST-fuse-Definitions-and-ioctl-for-passthrough.patch b/android-mainline/FROMLIST-fuse-Definitions-and-ioctl-for-passthrough.patch
index 3b4b6227..ba26356c 100644
--- a/android-mainline/FROMLIST-fuse-Definitions-and-ioctl-for-passthrough.patch
+++ b/android-mainline/FROMLIST-fuse-Definitions-and-ioctl-for-passthrough.patch
@@ -90,7 +90,7 @@ diff --git a/fs/fuse/file.c b/fs/fuse/file.c
 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 --- a/fs/fuse/fuse_i.h
 +++ b/fs/fuse/fuse_i.h
-@@ -178,6 +178,14 @@ struct fuse_conn;
+@@ -193,6 +193,14 @@ struct fuse_conn;
  struct fuse_mount;
  struct fuse_release_args;
  
@@ -105,7 +105,7 @@ diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
  /** FUSE specific file data */
  struct fuse_file {
  	/** Fuse connection for this file */
-@@ -223,6 +231,9 @@ struct fuse_file {
+@@ -238,6 +246,9 @@ struct fuse_file {
  
  	} readdir;
  
@@ -115,7 +115,7 @@ diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
  	/** RB node to be linked on fuse_conn->polled_files */
  	struct rb_node polled_node;
  
-@@ -782,6 +793,9 @@ struct fuse_conn {
+@@ -797,6 +808,9 @@ struct fuse_conn {
  	/* Auto-mount submounts announced by the server */
  	unsigned int auto_submounts:1;
  
@@ -125,7 +125,7 @@ diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
  	/* Propagate syncfs() to server */
  	unsigned int sync_fs:1;
  
-@@ -852,6 +866,12 @@ struct fuse_conn {
+@@ -867,6 +881,12 @@ struct fuse_conn {
  
  	/* New writepages go into this bucket */
  	struct fuse_sync_bucket __rcu *curr_bucket;
@@ -138,7 +138,7 @@ diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
  };
  
  /*
-@@ -1340,4 +1360,11 @@ struct fuse_file *fuse_file_open(struct fuse_mount *fm, u64 nodeid,
+@@ -1355,4 +1375,11 @@ struct fuse_file *fuse_file_open(struct fuse_mount *fm, u64 nodeid,
  void fuse_file_release(struct inode *inode, struct fuse_file *ff,
  		       unsigned int open_flags, fl_owner_t id, bool isdir);
  
@@ -153,7 +153,7 @@ diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
 --- a/fs/fuse/inode.c
 +++ b/fs/fuse/inode.c
-@@ -849,6 +849,7 @@ void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,
+@@ -901,6 +901,7 @@ void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,
  	memset(fc, 0, sizeof(*fc));
  	spin_lock_init(&fc->lock);
  	spin_lock_init(&fc->bg_lock);
@@ -161,7 +161,7 @@ diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
  	init_rwsem(&fc->killsb);
  	refcount_set(&fc->count, 1);
  	atomic_set(&fc->dev_count, 1);
-@@ -857,6 +858,7 @@ void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,
+@@ -909,6 +910,7 @@ void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,
  	INIT_LIST_HEAD(&fc->bg_queue);
  	INIT_LIST_HEAD(&fc->entry);
  	INIT_LIST_HEAD(&fc->devices);
@@ -169,7 +169,7 @@ diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
  	atomic_set(&fc->num_waiting, 0);
  	fc->max_background = FUSE_DEFAULT_MAX_BACKGROUND;
  	fc->congestion_threshold = FUSE_DEFAULT_CONGESTION_THRESHOLD;
-@@ -1224,6 +1226,12 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,
+@@ -1276,6 +1278,12 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,
  				fc->handle_killpriv_v2 = 1;
  				fm->sb->s_flags |= SB_NOSEC;
  			}
@@ -182,7 +182,7 @@ diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
  			if (flags & FUSE_SETXATTR_EXT)
  				fc->setxattr_ext = 1;
  			if (flags & FUSE_SECURITY_CTX)
-@@ -1311,9 +1319,16 @@ void fuse_send_init(struct fuse_mount *fm)
+@@ -1363,9 +1371,16 @@ void fuse_send_init(struct fuse_mount *fm)
  }
  EXPORT_SYMBOL_GPL(fuse_send_init);
  
@@ -228,7 +228,7 @@ new file mode 100644
 diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
 --- a/include/uapi/linux/fuse.h
 +++ b/include/uapi/linux/fuse.h
-@@ -759,7 +759,7 @@ struct fuse_create_in {
+@@ -761,7 +761,7 @@ struct fuse_create_in {
  struct fuse_open_out {
  	uint64_t	fh;
  	uint32_t	open_flags;
@@ -237,7 +237,7 @@ diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
  };
  
  struct fuse_release_in {
-@@ -970,6 +970,13 @@ struct fuse_in_header {
+@@ -972,6 +972,13 @@ struct fuse_in_header {
  	uint16_t	padding;
  };
  
@@ -251,7 +251,7 @@ diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
  struct fuse_out_header {
  	uint32_t	len;
  	int32_t		error;
-@@ -1050,6 +1057,7 @@ struct fuse_notify_retrieve_in {
+@@ -1052,6 +1059,7 @@ struct fuse_notify_retrieve_in {
  /* Device ioctls: */
  #define FUSE_DEV_IOC_MAGIC		229
  #define FUSE_DEV_IOC_CLONE		_IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)
diff --git a/android-mainline/FROMLIST-fuse-Introduce-passthrough-for-mmap.patch b/android-mainline/FROMLIST-fuse-Introduce-passthrough-for-mmap.patch
index a36f9b92..c7b9b92d 100644
--- a/android-mainline/FROMLIST-fuse-Introduce-passthrough-for-mmap.patch
+++ b/android-mainline/FROMLIST-fuse-Introduce-passthrough-for-mmap.patch
@@ -35,7 +35,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/fs/fuse/file.c b/fs/fuse/file.c
 --- a/fs/fuse/file.c
 +++ b/fs/fuse/file.c
-@@ -2470,6 +2470,9 @@ static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -2472,6 +2472,9 @@ static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma)
  	if (FUSE_IS_DAX(file_inode(file)))
  		return fuse_dax_mmap(file, vma);
  
@@ -44,11 +44,11 @@ diff --git a/fs/fuse/file.c b/fs/fuse/file.c
 +
  	if (ff->open_flags & FOPEN_DIRECT_IO) {
  		/* Can't provide the coherency needed for MAP_SHARED
- 		 * if FUSE_DIRECT_IO_RELAX isn't set.
+ 		 * if FUSE_DIRECT_IO_ALLOW_MMAP isn't set.
 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 --- a/fs/fuse/fuse_i.h
 +++ b/fs/fuse/fuse_i.h
-@@ -1371,5 +1371,6 @@ int fuse_passthrough_setup(struct fuse_conn *fc, struct fuse_file *ff,
+@@ -1386,5 +1386,6 @@ int fuse_passthrough_setup(struct fuse_conn *fc, struct fuse_file *ff,
  void fuse_passthrough_release(struct fuse_passthrough *passthrough);
  ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *to);
  ssize_t fuse_passthrough_write_iter(struct kiocb *iocb, struct iov_iter *from);
diff --git a/android-mainline/FROMLIST-fuse-Introduce-synchronous-read-and-write-for-passthrough.patch b/android-mainline/FROMLIST-fuse-Introduce-synchronous-read-and-write-for-passthrough.patch
index f77c0dac..f58c6352 100644
--- a/android-mainline/FROMLIST-fuse-Introduce-synchronous-read-and-write-for-passthrough.patch
+++ b/android-mainline/FROMLIST-fuse-Introduce-synchronous-read-and-write-for-passthrough.patch
@@ -45,7 +45,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/fs/fuse/file.c b/fs/fuse/file.c
 --- a/fs/fuse/file.c
 +++ b/fs/fuse/file.c
-@@ -1630,7 +1630,9 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
+@@ -1632,7 +1632,9 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
  	if (FUSE_IS_DAX(inode))
  		return fuse_dax_read_iter(iocb, to);
  
@@ -56,7 +56,7 @@ diff --git a/fs/fuse/file.c b/fs/fuse/file.c
  		return fuse_cache_read_iter(iocb, to);
  	else
  		return fuse_direct_read_iter(iocb, to);
-@@ -1648,7 +1650,9 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
+@@ -1650,7 +1652,9 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
  	if (FUSE_IS_DAX(inode))
  		return fuse_dax_write_iter(iocb, from);
  
@@ -70,7 +70,7 @@ diff --git a/fs/fuse/file.c b/fs/fuse/file.c
 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 --- a/fs/fuse/fuse_i.h
 +++ b/fs/fuse/fuse_i.h
-@@ -1366,5 +1366,7 @@ int fuse_passthrough_open(struct fuse_dev *fud,
+@@ -1381,5 +1381,7 @@ int fuse_passthrough_open(struct fuse_dev *fud,
  int fuse_passthrough_setup(struct fuse_conn *fc, struct fuse_file *ff,
  			   struct fuse_open_out *openarg);
  void fuse_passthrough_release(struct fuse_passthrough *passthrough);
diff --git a/android-mainline/FROMLIST-fuse-Passthrough-initialization-and-release.patch b/android-mainline/FROMLIST-fuse-Passthrough-initialization-and-release.patch
index a3e2e302..0f924402 100644
--- a/android-mainline/FROMLIST-fuse-Passthrough-initialization-and-release.patch
+++ b/android-mainline/FROMLIST-fuse-Passthrough-initialization-and-release.patch
@@ -52,7 +52,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
 --- a/fs/fuse/inode.c
 +++ b/fs/fuse/inode.c
-@@ -1321,6 +1321,11 @@ EXPORT_SYMBOL_GPL(fuse_send_init);
+@@ -1373,6 +1373,11 @@ EXPORT_SYMBOL_GPL(fuse_send_init);
  
  static int free_fuse_passthrough(int id, void *p, void *data)
  {
diff --git a/android-mainline/FROMLIST-fuse-Use-daemon-creds-in-passthrough-mode.patch b/android-mainline/FROMLIST-fuse-Use-daemon-creds-in-passthrough-mode.patch
index f97b182f..428f577a 100644
--- a/android-mainline/FROMLIST-fuse-Use-daemon-creds-in-passthrough-mode.patch
+++ b/android-mainline/FROMLIST-fuse-Use-daemon-creds-in-passthrough-mode.patch
@@ -49,7 +49,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 --- a/fs/fuse/fuse_i.h
 +++ b/fs/fuse/fuse_i.h
-@@ -180,10 +180,13 @@ struct fuse_release_args;
+@@ -195,10 +195,13 @@ struct fuse_release_args;
  
  /**
   * Reference to lower filesystem file for read/write operations handled in
diff --git a/android-mainline/FROMLIST-fuse-give-wakeup-hints-to-the-scheduler.patch b/android-mainline/FROMLIST-fuse-give-wakeup-hints-to-the-scheduler.patch
index 9a5fff98..dee4d8b7 100644
--- a/android-mainline/FROMLIST-fuse-give-wakeup-hints-to-the-scheduler.patch
+++ b/android-mainline/FROMLIST-fuse-give-wakeup-hints-to-the-scheduler.patch
@@ -124,7 +124,7 @@ diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 --- a/fs/fuse/fuse_i.h
 +++ b/fs/fuse/fuse_i.h
-@@ -411,19 +411,19 @@ struct fuse_iqueue_ops {
+@@ -426,19 +426,19 @@ struct fuse_iqueue_ops {
  	/**
  	 * Signal that a forget has been queued
  	 */
diff --git a/android-mainline/NOUPSTREAM-ANDROID-GKI-Don-t-compact-fuse_req-when-CONFIG_VIRTIO_FS-n.patch b/android-mainline/NOUPSTREAM-ANDROID-GKI-Don-t-compact-fuse_req-when-CONFIG_VIRTIO_FS-n.patch
index bc56d72b..dab9cacd 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-GKI-Don-t-compact-fuse_req-when-CONFIG_VIRTIO_FS-n.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-GKI-Don-t-compact-fuse_req-when-CONFIG_VIRTIO_FS-n.patch
@@ -19,7 +19,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
 --- a/fs/fuse/fuse_i.h
 +++ b/fs/fuse/fuse_i.h
-@@ -388,10 +388,8 @@ struct fuse_req {
+@@ -403,10 +403,8 @@ struct fuse_req {
  	/** Used to wake up the task waiting for completion of request*/
  	wait_queue_head_t waitq;
  
diff --git a/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-Kernel-Exports.patch b/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-Kernel-Exports.patch
index 2de46619..3ab15660 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-Kernel-Exports.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-Kernel-Exports.patch
@@ -147,7 +147,7 @@ diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
 diff --git a/kernel/events/core.c b/kernel/events/core.c
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -4621,6 +4621,7 @@ int perf_event_read_local(struct perf_event *event, u64 *value,
+@@ -4631,6 +4631,7 @@ int perf_event_read_local(struct perf_event *event, u64 *value,
  
  	return ret;
  }
diff --git a/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch b/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch
index 1a3cbb31..eb9c2b8f 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-UFS-Exports.patch
@@ -28,7 +28,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
 --- a/drivers/ufs/core/ufshcd.c
 +++ b/drivers/ufs/core/ufshcd.c
-@@ -3301,7 +3301,7 @@ static inline void ufshcd_init_query(struct ufs_hba *hba,
+@@ -3302,7 +3302,7 @@ static inline void ufshcd_init_query(struct ufs_hba *hba,
  	(*request)->upiu_req.selector = selector;
  }
  
@@ -37,7 +37,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  	enum query_opcode opcode, enum flag_idn idn, u8 index, bool *flag_res)
  {
  	int ret;
-@@ -3323,6 +3323,7 @@ static int ufshcd_query_flag_retry(struct ufs_hba *hba,
+@@ -3324,6 +3324,7 @@ static int ufshcd_query_flag_retry(struct ufs_hba *hba,
  			__func__, opcode, idn, ret, retries);
  	return ret;
  }
@@ -45,7 +45,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  
  /**
   * ufshcd_query_flag() - API function for sending flag query requests
-@@ -3391,6 +3392,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
+@@ -3392,6 +3393,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
  	ufshcd_release(hba);
  	return err;
  }
@@ -53,7 +53,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  
  /**
   * ufshcd_query_attr - API function for sending attribute requests
-@@ -3454,6 +3456,7 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
+@@ -3455,6 +3457,7 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
  	ufshcd_release(hba);
  	return err;
  }
@@ -61,7 +61,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  
  /**
   * ufshcd_query_attr_retry() - API function for sending query
-@@ -3491,6 +3494,7 @@ int ufshcd_query_attr_retry(struct ufs_hba *hba,
+@@ -3492,6 +3495,7 @@ int ufshcd_query_attr_retry(struct ufs_hba *hba,
  			__func__, idn, ret, QUERY_REQ_RETRIES);
  	return ret;
  }
@@ -69,7 +69,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  
  static int __ufshcd_query_descriptor(struct ufs_hba *hba,
  			enum query_opcode opcode, enum desc_idn idn, u8 index,
-@@ -3587,6 +3591,7 @@ int ufshcd_query_descriptor_retry(struct ufs_hba *hba,
+@@ -3588,6 +3592,7 @@ int ufshcd_query_descriptor_retry(struct ufs_hba *hba,
  
  	return err;
  }
@@ -77,7 +77,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  
  /**
   * ufshcd_read_desc_param - read the specified descriptor parameter
-@@ -3666,6 +3671,7 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
+@@ -3667,6 +3672,7 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
  		kfree(desc_buf);
  	return ret;
  }
@@ -85,7 +85,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  
  /**
   * struct uc_string_id - unicode string
-@@ -5883,7 +5889,7 @@ static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status)
+@@ -5884,7 +5890,7 @@ static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status)
   * to know whether auto bkops is enabled or disabled after this function
   * returns control to it.
   */
@@ -94,7 +94,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  			     enum bkops_status status)
  {
  	int err;
-@@ -5908,6 +5914,7 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba,
+@@ -5909,6 +5915,7 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba,
  out:
  	return err;
  }
diff --git a/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-related-vendor-hooks.patch b/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-related-vendor-hooks.patch
index 4314bb8b..a6eca826 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-related-vendor-hooks.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-scsi-SCSI-related-vendor-hooks.patch
@@ -85,7 +85,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  	ufshcd_add_command_trace(hba, task_tag, UFS_CMD_SEND);
  	if (lrbp->cmd)
  		ufshcd_clk_scaling_start_busy(hba);
-@@ -2600,13 +2608,16 @@ static int ufshcd_map_sg(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
+@@ -2601,13 +2609,16 @@ static int ufshcd_map_sg(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
  {
  	struct scsi_cmnd *cmd = lrbp->cmd;
  	int sg_segments = scsi_dma_map(cmd);
@@ -103,7 +103,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  }
  
  /**
-@@ -2976,6 +2987,14 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
+@@ -2977,6 +2988,14 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
  
  	ufshcd_prepare_lrbp_crypto(scsi_cmd_to_rq(cmd), lrbp);
  
@@ -118,7 +118,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  	lrbp->req_abort_skip = false;
  
  	ufshcd_comp_scsi_upiu(hba, lrbp);
-@@ -5489,6 +5508,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
+@@ -5490,6 +5509,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
  	lrbp->compl_time_stamp = ktime_get();
  	cmd = lrbp->cmd;
  	if (cmd) {
@@ -126,7 +126,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  		if (unlikely(ufshcd_should_inform_monitor(hba, lrbp)))
  			ufshcd_update_monitor(hba, lrbp);
  		ufshcd_add_command_trace(hba, task_tag, UFS_CMD_COMP);
-@@ -5499,6 +5519,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
+@@ -5500,6 +5520,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
  	} else if (lrbp->command_type == UTP_CMD_TYPE_DEV_MANAGE ||
  		   lrbp->command_type == UTP_CMD_TYPE_UFS_STORAGE) {
  		if (hba->dev_cmd.complete) {
@@ -134,7 +134,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  			if (cqe) {
  				ocs = le32_to_cpu(cqe->status) & MASK_OCS;
  				lrbp->utr_descriptor_ptr->header.ocs = ocs;
-@@ -6808,6 +6829,8 @@ static irqreturn_t ufshcd_check_errors(struct ufs_hba *hba, u32 intr_status)
+@@ -6809,6 +6830,8 @@ static irqreturn_t ufshcd_check_errors(struct ufs_hba *hba, u32 intr_status)
  		queue_eh_work = true;
  	}
  
@@ -143,7 +143,7 @@ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
  	if (queue_eh_work) {
  		/*
  		 * update the transfer error masks to sticky bits, let's do this
-@@ -10571,7 +10594,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
+@@ -10572,7 +10595,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
  	ufshcd_set_ufs_dev_active(hba);
  
  	async_schedule(ufshcd_async_scan, hba);
diff --git a/android-mainline/series b/android-mainline/series
index 126c3bce..f4327513 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
 #
 # android-mainline patches
 #
-# Applies onto upstream a39b6ac3781d4 Linux v6.7-rc5
-# Matches android-mainline b5f0c45652ff9 ("Merge tag 'v6.7-rc5' into android-mainline")
+# Applies onto upstream 08bd31ece0820 Linux v6.7-rc8-53-g08bd31ece0820
+# Matches android-mainline 818858f54a3c1 ("Merge 08bd31ece082 ("Merge tag 'sound-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") into android-mainline")
 # Status: Tested
 #
 Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch