summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Jones <joneslee@google.com>2024-01-30 10:18:29 +0000
committerLee Jones <joneslee@google.com>2024-01-30 11:00:08 +0000
commitf4e5d14099f815540b2caff97fe133b7d19f3c86 (patch)
tree8dfe4fe2cf21374624f8b8eb98b196e3f196cec8
parent432d723c46a170fa8fabfd35981a1dd1525894ab (diff)
downloadcommon-patches-f4e5d14099f815540b2caff97fe133b7d19f3c86.tar.gz
aosp/android-mainline: update series (rebase onto v6.7)
up to cb4cf525e1279 ("Merge tag 'v6.7' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ibb3d4c7746607e34712b10c3f48f1a43296b408d
-rw-r--r--android-mainline/series4
1 files changed, 2 insertions, 2 deletions
diff --git a/android-mainline/series b/android-mainline/series
index 0287095a..44c0ef89 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
#
# android-mainline patches
#
-# Applies onto upstream 52b1853b080a0 Linux v6.7-rc8-177-g52b1853b080a0
-# Matches android-mainline 564c96e25b892 ("Merge 52b1853b080a ("Merge tag 'i2c-for-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline")
+# Applies onto upstream 0dd3ee3112550 Linux v6.7
+# Matches android-mainline cb4cf525e1279 ("Merge tag 'v6.7' into android-mainline")
# Status: Tested
#
Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch