Merge "aosp/android-mainline: update series (rebase onto v6.10-11306-g33c9de2960d3)" into main
diff --git a/android-mainline/ANDROID-GKI-Disable-KUnit-built-in-testing.patch b/android-mainline/ANDROID-GKI-Disable-KUnit-built-in-testing.patch
index 1c0e8b0..a0e8ab6 100644
--- a/android-mainline/ANDROID-GKI-Disable-KUnit-built-in-testing.patch
+++ b/android-mainline/ANDROID-GKI-Disable-KUnit-built-in-testing.patch
@@ -26,7 +26,7 @@
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2616,7 +2616,7 @@
+@@ -2618,7 +2618,7 @@
CONFIG_KUNIT to be set to be fully enabled. The
default value can be overridden via
KUNIT_DEFAULT_ENABLED.
diff --git a/android-mainline/ANDROID-rcu-Add-a-minimum-time-for-marking-boot-as-completed.patch b/android-mainline/ANDROID-rcu-Add-a-minimum-time-for-marking-boot-as-completed.patch
index 870508d..5fffa4d 100644
--- a/android-mainline/ANDROID-rcu-Add-a-minimum-time-for-marking-boot-as-completed.patch
+++ b/android-mainline/ANDROID-rcu-Add-a-minimum-time-for-marking-boot-as-completed.patch
@@ -97,7 +97,7 @@
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -5406,6 +5406,21 @@
+@@ -5426,6 +5426,21 @@
rcutorture.verbose= [KNL]
Enable additional printk() statements.
diff --git a/android-mainline/series b/android-mainline/series
index 210e3da..58272db 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
#
# android-mainline patches
#
-# Applies onto upstream 3f386cb8ee9f Linux v6.10-10670-g3f386cb8ee9f
-# Matches android-mainline b7259d0c9545 ("FROMLIST: binder: fix UAF caused by offsets overwrite")
+# Applies onto upstream 33c9de2960d3 Linux v6.10-11306-g33c9de2960d3
+# Matches android-mainline 7818437b8371 ("Merge 33c9de2960d3 ("Merge tag '6.11-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6") into android-mainline")
# Status: Tested
#
Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch
