Merge "aosp/android-mainline: update series (rebase onto v6.7-rc5)" into main

8 files changed, 12 insertions, 12 deletions

diff --git a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch
index d44190d0..e9fb4bc9 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
-@@ -10422,6 +10422,13 @@ F:	Documentation/hwmon/ina2xx.rst
+@@ -10369,6 +10369,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-io_uring-rely-solely-on-FMODE_NOWAIT.patch b/android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch
index 0b015060..62d2b7e9 100644
--- a/android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch
+++ b/android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch
@@ -27,7 +27,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
 --- a/io_uring/io_uring.c
 +++ b/io_uring/io_uring.c
-@@ -1761,6 +1761,11 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
+@@ -1763,6 +1763,11 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
  	}
  }
  
@@ -39,7 +39,7 @@ diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
  /*
   * If we tracked the file through the SCM inflight mechanism, we could support
   * any file. For now, just ensure that anything potentially problematic is done
-@@ -1768,6 +1773,22 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
+@@ -1770,6 +1775,22 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
   */
  static bool __io_file_supports_nowait(struct file *file, umode_t mode)
  {
diff --git a/android-mainline/ANDROID-Revert-io_uring-remove-__io_file_supports_nowait.patch b/android-mainline/ANDROID-Revert-io_uring-remove-__io_file_supports_nowait.patch
index 59334f32..bc1f5599 100644
--- a/android-mainline/ANDROID-Revert-io_uring-remove-__io_file_supports_nowait.patch
+++ b/android-mainline/ANDROID-Revert-io_uring-remove-__io_file_supports_nowait.patch
@@ -25,7 +25,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
 --- a/io_uring/io_uring.c
 +++ b/io_uring/io_uring.c
-@@ -1761,6 +1761,19 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
+@@ -1763,6 +1763,19 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
  	}
  }
  
@@ -45,7 +45,7 @@ diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
  unsigned int io_file_get_flags(struct file *file)
  {
  	umode_t mode = file_inode(file)->i_mode;
-@@ -1768,7 +1781,7 @@ unsigned int io_file_get_flags(struct file *file)
+@@ -1770,7 +1783,7 @@ unsigned int io_file_get_flags(struct file *file)
  
  	if (S_ISREG(mode))
  		res |= REQ_F_ISREG;
diff --git a/android-mainline/ANDROID-Revert-io_uring-remove-the-mode-variable-in-io_file_get_flags.patch b/android-mainline/ANDROID-Revert-io_uring-remove-the-mode-variable-in-io_file_get_flags.patch
index 48f4b265..0cd60e11 100644
--- a/android-mainline/ANDROID-Revert-io_uring-remove-the-mode-variable-in-io_file_get_flags.patch
+++ b/android-mainline/ANDROID-Revert-io_uring-remove-the-mode-variable-in-io_file_get_flags.patch
@@ -26,7 +26,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
 --- a/io_uring/io_uring.c
 +++ b/io_uring/io_uring.c
-@@ -1763,9 +1763,10 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
+@@ -1765,9 +1765,10 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)
  
  unsigned int io_file_get_flags(struct file *file)
  {
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 514fb646..95ee1dc3 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
-@@ -6805,23 +6805,12 @@ static void perf_pending_task(struct callback_head *head)
+@@ -6820,23 +6820,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);
  
-@@ -6831,10 +6820,6 @@ void perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *cbs)
+@@ -6846,10 +6835,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/NOUPSTREAM-ANDROID-kernel-Core-Kernel-Exports.patch b/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-Kernel-Exports.patch
index a122aa5d..2de46619 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
-@@ -4606,6 +4606,7 @@ int perf_event_read_local(struct perf_event *event, u64 *value,
+@@ -4621,6 +4621,7 @@ int perf_event_read_local(struct perf_event *event, u64 *value,
  
  	return ret;
  }
diff --git a/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-kernel-related-vendor-hooks.patch b/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-kernel-related-vendor-hooks.patch
index 535a2a75..345ef2d7 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-kernel-related-vendor-hooks.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-kernel-Core-kernel-related-vendor-hooks.patch
@@ -581,7 +581,7 @@ diff --git a/kernel/workqueue.c b/kernel/workqueue.c
  enum {
  	/*
  	 * worker_pool flags
-@@ -6440,6 +6444,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
+@@ -6437,6 +6441,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
  			pr_cont_pool_info(pool);
  			pr_cont(" stuck for %us!\n",
  				jiffies_to_msecs(now - pool_ts) / 1000);
diff --git a/android-mainline/series b/android-mainline/series
index 83b0baa6..126c3bce 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
 #
 # android-mainline patches
 #
-# Applies onto upstream 33cc938e65a98 Linux v6.7-rc4
-# Matches android-mainline c16f17d26433a ("Merge tag 'v6.7-rc4' into android-mainline")
+# Applies onto upstream a39b6ac3781d4 Linux v6.7-rc5
+# Matches android-mainline b5f0c45652ff9 ("Merge tag 'v6.7-rc5' into android-mainline")
 # Status: Tested
 #
 Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch