summaryrefslogtreecommitdiff
path: root/android-mainline/series
diff options
context:
space:
mode:
Diffstat (limited to 'android-mainline/series')
-rw-r--r--android-mainline/series5
1 files changed, 3 insertions, 2 deletions
diff --git a/android-mainline/series b/android-mainline/series
index b6aa0f40..34339cb7 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
#
# android-mainline patches
#
-# 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")
+# Applies onto upstream 0d3ac66ed81cb Linux v6.7-rc8-161-g0d3ac66ed81cb
+# Matches android-mainline 22858186da5ac ("ANDROID: Revert "gen_compile_commands.py: fix path resolve with symlinks in it"")
# Status: Tested
#
Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch
@@ -20,6 +20,7 @@ TODO-LEE-ANDROID-Revert-usb-typec-tcpm-not-sink-vbus-if-operational-current-is-0
Revert-sched-debug-Remove-the-proc-sys-kernel-sched_child_runs_first-sysctl.patch
Revert-crypto-pkcs7-remove-sha1-support.patch
Revert-usb-typec-tcpm-fix-cc-role-at-port-reset-2.patch
+ANDROID-Revert-gen_compile_commands.py-fix-path-resolve-with-symlinks-in-it.patch
_____ANNOTATION-pending-upstream_____.patch
UPSTREAM-fuse-fix-matching-of-FUSE_DEV_IOC_CLONE-command.patch
FROMLIST-fuse-Definitions-and-ioctl-for-passthrough.patch