summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Jones <joneslee@google.com>2024-01-30 10:01:08 +0000
committerLee Jones <joneslee@google.com>2024-01-30 11:00:08 +0000
commitab9929086c0038bdbc1887c1d55190c30bd34515 (patch)
tree25f6840bd45ef87eda81d0289cb9a11e1c4ddc36
parent626aa857642048b8ab117c78979b540bfc9223bb (diff)
downloadcommon-patches-ab9929086c0038bdbc1887c1d55190c30bd34515.tar.gz
aosp/android-mainline: update series (rebase onto v6.7-rc8-159-ga4ab2706bb128)
up to 0d8a6c7eb97fc ("Merge a4ab2706bb12 ("Merge tag 'firewire-fixes-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I2442669f75d67dec38b8f7ef83f314d395171e68
-rw-r--r--android-mainline/series4
1 files changed, 2 insertions, 2 deletions
diff --git a/android-mainline/series b/android-mainline/series
index 338ce583..b6aa0f40 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
#
# android-mainline patches
#
-# Applies onto upstream 6c23529c08fc7 Linux v6.7-rc8-157-g6c23529c08fc7
-# Matches android-mainline 560c91f932d41 ("Merge 6c23529c08fc ("Merge tag 'mmc-v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline")
+# Applies onto upstream a4ab2706bb128 Linux v6.7-rc8-159-ga4ab2706bb128
+# Matches android-mainline 0d8a6c7eb97fc ("Merge a4ab2706bb12 ("Merge tag 'firewire-fixes-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394") into android-mainline")
# Status: Tested
#
Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch