aosp/android-mainline: update series (rebase onto v6.1-rc3)
up to 68ff963c1e098 ("Merge tag 'v6.1-rc3' into android-mainline")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I0a5a4b25f47546018c8cb7ecbf515c7c41d81bf2
diff --git a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch
index ccec811..fe7ae4b 100644
--- a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch
+++ b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch
@@ -221,7 +221,7 @@
diff --git a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -10021,6 +10021,13 @@ F: Documentation/hwmon/ina2xx.rst
+@@ -10024,6 +10024,13 @@ F: Documentation/hwmon/ina2xx.rst
F: drivers/hwmon/ina2xx.c
F: include/linux/platform_data/ina2xx.h
diff --git a/android-mainline/series b/android-mainline/series
index 9ce48a0..c211497 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
#
# android-mainline patches
#
-# Applies onto upstream 882ad2a2a8ffa Linux v6.1-rc2-412-g882ad2a2a8ffa
-# Matches android-mainline 22c3a088c5217 ("Merge 882ad2a2a8ff ("Merge tag 'random-6.1-rc3-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random") into android-mainline")
+# Applies onto upstream 30a0b95b1335e Linux v6.1-rc3
+# Matches android-mainline 68ff963c1e098 ("Merge tag 'v6.1-rc3' into android-mainline")
# Status: Tested
#
Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch
