Merge changes I5ecf8231,I96a15f5f into main

* changes:
  aosp/android-mainline: update series
  aosp/android-mainline: update series (rebase onto v6.7-rc8-161-g0d3ac66ed81cb)

6 files changed, 432 insertions, 27 deletions

diff --git a/android-mainline/ANDROID-Revert-gen_compile_commands.py-fix-path-resolve-with-symlinks-in-it.patch b/android-mainline/ANDROID-Revert-gen_compile_commands.py-fix-path-resolve-with-symlinks-in-it.patch
new file mode 100644
index 00000000..777d8050
--- /dev/null
+++ b/android-mainline/ANDROID-Revert-gen_compile_commands.py-fix-path-resolve-with-symlinks-in-it.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ulises Mendez Martinez <umendez@google.com>
+Date: Tue, 16 Jan 2024 15:24:10 +0000
+Subject: ANDROID: Revert "gen_compile_commands.py: fix path resolve with
+ symlinks in it"
+
+* This reverts commit 880946158b01138c06e93e4aa4255ffbfe70e1c8
+* Reason for revert: It breaks `kleaf_kythe` target.
+
+Bug: 320449031
+Change-Id: I63ad1a8a31c48dff8c9cb699b43dee6c1d46abd6
+Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
+---
+ scripts/clang-tools/gen_compile_commands.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/clang-tools/gen_compile_commands.py b/scripts/clang-tools/gen_compile_commands.py
+--- a/scripts/clang-tools/gen_compile_commands.py
++++ b/scripts/clang-tools/gen_compile_commands.py
+@@ -64,7 +64,7 @@ def parse_arguments():
+     args = parser.parse_args()
+ 
+     return (args.log_level,
+-            os.path.realpath(args.directory),
++            os.path.abspath(args.directory),
+             args.output,
+             args.ar,
+             args.paths if len(args.paths) > 0 else [args.directory])
+@@ -172,8 +172,8 @@ def process_line(root_directory, command_prefix, file_path):
+     # by Make, so this code replaces the escaped version with '#'.
+     prefix = command_prefix.replace('\#', '#').replace('$(pound)', '#')
+ 
+-    # Return the canonical path, eliminating any symbolic links encountered in the path.
+-    abs_path = os.path.realpath(os.path.join(root_directory, file_path))
++    # Use os.path.abspath() to normalize the path resolving '.' and '..' .
++    abs_path = os.path.abspath(os.path.join(root_directory, file_path))
+     if not os.path.exists(abs_path):
+         raise ValueError('File %s not found' % abs_path)
+     return {
diff --git a/android-mainline/ANDROID-tools-Miscellaneous.patch b/android-mainline/ANDROID-tools-Miscellaneous.patch
index 1bc583dc..6987a218 100644
--- a/android-mainline/ANDROID-tools-Miscellaneous.patch
+++ b/android-mainline/ANDROID-tools-Miscellaneous.patch
@@ -9,7 +9,9 @@ Change-Id: Ic155709fbf07ec0575fa2fa954ee199e63051a97
  tools/testing/android/OWNERS                  |  4 +
  tools/testing/android/bin/acloudb.sh          | 43 +++++++++
  tools/testing/android/bin/kselftest.sh        | 88 +++++++++++++++++++
+ .../testing/selftests/android/config_arm.xml  | 82 +++++++++++++++++
  .../selftests/android/config_arm64.xml        | 82 +++++++++++++++++
+ .../testing/selftests/android/config_x86.xml  | 88 +++++++++++++++++++
  .../selftests/android/config_x86_64.xml       | 88 +++++++++++++++++++
  .../filesystems/binderfs/binderfs_test.c      | 10 +++
  .../selftests/futex/functional/futex_wait.c   |  6 ++
@@ -17,11 +19,13 @@ Change-Id: Ic155709fbf07ec0575fa2fa954ee199e63051a97
  .../futex/functional/futex_wait_wouldblock.c  | 13 ++-
  tools/testing/selftests/net/psock_tpacket.c   |  2 +
  tools/testing/selftests/rtc/rtctest.c         |  2 +
- 11 files changed, 342 insertions(+), 7 deletions(-)
+ 13 files changed, 512 insertions(+), 7 deletions(-)
  create mode 100644 tools/testing/android/OWNERS
  create mode 100755 tools/testing/android/bin/acloudb.sh
  create mode 100755 tools/testing/android/bin/kselftest.sh
+ create mode 100644 tools/testing/selftests/android/config_arm.xml
  create mode 100644 tools/testing/selftests/android/config_arm64.xml
+ create mode 100644 tools/testing/selftests/android/config_x86.xml
  create mode 100644 tools/testing/selftests/android/config_x86_64.xml
 
 diff --git a/tools/testing/android/OWNERS b/tools/testing/android/OWNERS
@@ -174,6 +178,93 @@ new file mode 100755
 +    echo "Test finished. Deleting cvd..."
 +    $ACLOUD delete --instance-names $INSTANCE_NAME
 +fi
+diff --git a/tools/testing/selftests/android/config_arm.xml b/tools/testing/selftests/android/config_arm.xml
+new file mode 100644
+--- /dev/null
++++ b/tools/testing/selftests/android/config_arm.xml
+@@ -0,0 +1,82 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright (C) 2023 The Android Open Source Project
++SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
++-->
++<!DOCTYPE configuration [
++<!ENTITY ktest_dir "/data/selftests/arm">
++]>
++<configuration description="kselftest">
++    <option name="test-suite-tag" value="kernel-test" />
++    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
++    <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" />
++
++    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" >
++        <option name="arch" value="arm"/>
++    </object>
++
++    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
++        <option name="cleanup" value="true" />
++        <option name="push-file" key="selftests" value="/data/selftests" />
++        <option name="skip-abi-filtering" value="true" />
++        <option name="post-push" value='chmod -R 755 /data/selftests; find /data/selftests -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
++    </target_preparer>
++
++    <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
++        <option name="exit-code-skip" value="4" />
++        <option name="skip-binary-check" value="true" />
++        <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" />
++        <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" />
++        <option name="test-command-line" key="kselftest_capabilities_test_execve" value="cd &ktest_dir;; ./kselftest_capabilities_test_execve" />
++        <option name="test-command-line" key="kselftest_futex_requeue" value="cd &ktest_dir;; ./futex_requeue" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi" value="cd &ktest_dir;; ./futex_requeue_pi" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_b" value="cd &ktest_dir;; ./futex_requeue_pi -b" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl" value="cd &ktest_dir;; ./futex_requeue_pi -b -l" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bo" value="cd &ktest_dir;; ./futex_requeue_pi -b -o" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l" value="cd &ktest_dir;; ./futex_requeue_pi -l" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_o" value="cd &ktest_dir;; ./futex_requeue_pi -o" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_5k" value="cd &ktest_dir;; ./futex_requeue_pi -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_b_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l_5k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_o_5k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_500k" value="cd &ktest_dir;; ./futex_requeue_pi -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_b_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l_500k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_o_500k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_2G" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 2000000000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l_2G" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 2000000000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_mismatched_ops" value="cd &ktest_dir;; ./futex_requeue_pi_mismatched_ops" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_signal_restart" value="cd &ktest_dir;; ./futex_requeue_pi_signal_restart" />
++        <option name="test-command-line" key="kselftest_futex_wait" value="cd &ktest_dir;; ./futex_wait" />
++        <option name="test-command-line" key="kselftest_futex_wait_private_mapped_file" value="cd &ktest_dir;; ./futex_wait_private_mapped_file" />
++        <option name="test-command-line" key="kselftest_futex_wait_timeout" value="cd &ktest_dir;; ./futex_wait_timeout" />
++        <option name="test-command-line" key="kselftest_futex_wait_uninitialized_heap" value="cd &ktest_dir;; ./futex_wait_uninitialized_heap" />
++        <option name="test-command-line" key="kselftest_futex_wait_wouldblock" value="cd &ktest_dir;; ./futex_wait_wouldblock" />
++        <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="cd &ktest_dir;; ./kselftest_kcmp_kcmp_test" />
++        <option name="test-command-line" key="kselftest_mm_mremap_dontunmap" value="cd &ktest_dir;; ./kselftest_mm_mremap_dontunmap" />
++        <option name="test-command-line" key="kselftest_mm_mremap_test" value="cd &ktest_dir;; ./kselftest_mm_mremap_test" />
++        <option name="test-command-line" key="kselftest_mm_uffd_unit_tests" value="cd &ktest_dir;; ./kselftest_mm_uffd_unit_tests" />
++        <option name="test-command-line" key="kselftest_net_socket" value="cd &ktest_dir;; ./kselftest_net_socket" />
++        <!--option name="test-command-line" key="kselftest_net_psock_tpacket" value="cd &ktest_dir;; ./kselftest_net_psock_tpacket" /-->
++        <option name="test-command-line" key="kselftest_net_reuseaddr_conflict" value="cd &ktest_dir;; ./kselftest_net_reuseaddr_conflict" />
++        <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="cd &ktest_dir;; ./kselftest_ptrace_peeksiginfo" />
++        <option name="test-command-line" key="kselftest_rtc_rtctest" value="cd &ktest_dir;; ./kselftest_rtc_rtctest" />
++        <!--option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" /-->
++        <option name="test-command-line" key="kselftest_size_test_get_size" value="cd &ktest_dir;; ./kselftest_size_test_get_size" />
++        <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="cd &ktest_dir;; ./inconsistency-check" />
++        <option name="test-command-line" key="kselftest_timers_nanosleep" value="cd &ktest_dir;; ./nanosleep" />
++        <option name="test-command-line" key="kselftest_timers_nsleep_lat" value="cd &ktest_dir;; ./nsleep-lat" />
++        <option name="test-command-line" key="kselftest_timers_posix_timers" value="cd &ktest_dir;; ./kselftest_timers_posix_timers" />
++        <option name="test-command-line" key="kselftest_timers_set_timer_lat" value="cd &ktest_dir;; ./kselftest_timers_set_timer_lat" />
++        <option name="test-command-line" key="kselftest_timers_tests_raw_skew" value="cd &ktest_dir;; ./raw_skew" />
++        <option name="test-command-line" key="kselftest_timers_threadtest" value="cd &ktest_dir;; ./kselftest_timers_threadtest" />
++        <option name="test-command-line" key="kselftest_timers_valid_adjtimex" value="cd &ktest_dir;; ./kselftest_timers_valid_adjtimex" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_abi" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_abi" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_clock_getres" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_clock_getres" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_getcpu" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_getcpu" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_gettimeofday" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_gettimeofday" />
++    </test>
++</configuration>
 diff --git a/tools/testing/selftests/android/config_arm64.xml b/tools/testing/selftests/android/config_arm64.xml
 new file mode 100644
 --- /dev/null
@@ -261,6 +352,99 @@ new file mode 100644
 +        <option name="test-command-line" key="kselftest_vdso_vdso_test_gettimeofday" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_gettimeofday" />
 +    </test>
 +</configuration>
+diff --git a/tools/testing/selftests/android/config_x86.xml b/tools/testing/selftests/android/config_x86.xml
+new file mode 100644
+--- /dev/null
++++ b/tools/testing/selftests/android/config_x86.xml
+@@ -0,0 +1,88 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright (C) 2023 The Android Open Source Project
++SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
++-->
++<!DOCTYPE configuration [
++<!ENTITY ktest_dir "/data/selftests/x86">
++]>
++<configuration description="kselftest">
++    <option name="test-suite-tag" value="kernel-test" />
++    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
++    <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" />
++
++    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" >
++        <option name="arch" value="x86"/>
++    </object>
++
++    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
++        <option name="cleanup" value="true" />
++        <option name="push-file" key="selftests" value="/data/selftests" />
++        <option name="skip-abi-filtering" value="true" />
++        <option name="post-push" value='chmod -R 755 /data/selftests; find /data/selftests -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
++    </target_preparer>
++
++    <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
++        <option name="exit-code-skip" value="4" />
++        <option name="skip-binary-check" value="true" />
++        <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" />
++        <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" />
++        <option name="test-command-line" key="kselftest_capabilities_test_execve" value="cd &ktest_dir;; ./kselftest_capabilities_test_execve" />
++        <option name="test-command-line" key="kselftest_futex_requeue" value="cd &ktest_dir;; ./futex_requeue" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi" value="cd &ktest_dir;; ./futex_requeue_pi" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_b" value="cd &ktest_dir;; ./futex_requeue_pi -b" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl" value="cd &ktest_dir;; ./futex_requeue_pi -b -l" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bo" value="cd &ktest_dir;; ./futex_requeue_pi -b -o" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l" value="cd &ktest_dir;; ./futex_requeue_pi -l" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_o" value="cd &ktest_dir;; ./futex_requeue_pi -o" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_5k" value="cd &ktest_dir;; ./futex_requeue_pi -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_b_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_5k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l_5k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_o_5k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 5000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_500k" value="cd &ktest_dir;; ./futex_requeue_pi -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_b_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bo_500k" value="cd &ktest_dir;; ./futex_requeue_pi -b -o -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l_500k" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_o_500k" value="cd &ktest_dir;; ./futex_requeue_pi -o -t 500000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_bl_2G" value="cd &ktest_dir;; ./futex_requeue_pi -b -l -t 2000000000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_l_2G" value="cd &ktest_dir;; ./futex_requeue_pi -l -t 2000000000" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_mismatched_ops" value="cd &ktest_dir;; ./futex_requeue_pi_mismatched_ops" />
++        <option name="test-command-line" key="kselftest_futex_requeue_pi_signal_restart" value="cd &ktest_dir;; ./futex_requeue_pi_signal_restart" />
++        <option name="test-command-line" key="kselftest_futex_wait" value="cd &ktest_dir;; ./futex_wait" />
++        <option name="test-command-line" key="kselftest_futex_wait_private_mapped_file" value="cd &ktest_dir;; ./futex_wait_private_mapped_file" />
++        <option name="test-command-line" key="kselftest_futex_wait_timeout" value="cd &ktest_dir;; ./futex_wait_timeout" />
++        <option name="test-command-line" key="kselftest_futex_wait_uninitialized_heap" value="cd &ktest_dir;; ./futex_wait_uninitialized_heap" />
++        <option name="test-command-line" key="kselftest_futex_wait_wouldblock" value="cd &ktest_dir;; ./futex_wait_wouldblock" />
++        <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="cd &ktest_dir;; ./kselftest_kcmp_kcmp_test" />
++        <option name="test-command-line" key="kselftest_mm_mremap_dontunmap" value="cd &ktest_dir;; ./kselftest_mm_mremap_dontunmap" />
++        <option name="test-command-line" key="kselftest_mm_mremap_test" value="cd &ktest_dir;; ./kselftest_mm_mremap_test" />
++        <option name="test-command-line" key="kselftest_mm_uffd_unit_tests" value="cd &ktest_dir;; ./kselftest_mm_uffd_unit_tests" />
++        <option name="test-command-line" key="kselftest_net_socket" value="cd &ktest_dir;; ./kselftest_net_socket" />
++        <option name="test-command-line" key="kselftest_net_psock_tpacket" value="cd &ktest_dir;; ./kselftest_net_psock_tpacket" />
++        <option name="test-command-line" key="kselftest_net_reuseaddr_conflict" value="cd &ktest_dir;; ./kselftest_net_reuseaddr_conflict" />
++        <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="cd &ktest_dir;; ./kselftest_ptrace_peeksiginfo" />
++        <option name="test-command-line" key="kselftest_rtc_rtctest" value="cd &ktest_dir;; ./kselftest_rtc_rtctest" />
++        <option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" />
++        <option name="test-command-line" key="kselftest_size_test_get_size" value="cd &ktest_dir;; ./kselftest_size_test_get_size" />
++        <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="cd &ktest_dir;; ./inconsistency-check" />
++        <option name="test-command-line" key="kselftest_timers_nanosleep" value="cd &ktest_dir;; ./nanosleep" />
++        <option name="test-command-line" key="kselftest_timers_nsleep_lat" value="cd &ktest_dir;; ./nsleep-lat" />
++        <option name="test-command-line" key="kselftest_timers_posix_timers" value="cd &ktest_dir;; ./kselftest_timers_posix_timers" />
++        <option name="test-command-line" key="kselftest_timers_set_timer_lat" value="cd &ktest_dir;; ./kselftest_timers_set_timer_lat" />
++        <option name="test-command-line" key="kselftest_timers_tests_raw_skew" value="cd &ktest_dir;; ./raw_skew" />
++        <option name="test-command-line" key="kselftest_timers_threadtest" value="cd &ktest_dir;; ./kselftest_timers_threadtest" />
++        <option name="test-command-line" key="kselftest_timers_valid_adjtimex" value="cd &ktest_dir;; ./kselftest_timers_valid_adjtimex" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_abi" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_abi" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_clock_getres" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_clock_getres" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_getcpu" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_getcpu" />
++        <option name="test-command-line" key="kselftest_vdso_vdso_test_gettimeofday" value="cd &ktest_dir;; ./kselftest_vdso_vdso_test_gettimeofday" />
++        <option name="test-command-line" key="kselftest_x86_check_initial_reg_state" value="cd &ktest_dir;; ./kselftest_x86_check_initial_reg_state" />
++        <option name="test-command-line" key="kselftest_x86_ldt_gdt" value="cd &ktest_dir;; ./kselftest_x86_ldt_gdt" />
++        <option name="test-command-line" key="kselftest_x86_ptrace_syscall" value="cd &ktest_dir;; ./kselftest_x86_ptrace_syscall" />
++        <option name="test-command-line" key="kselftest_x86_single_step_syscall" value="cd &ktest_dir;; ./kselftest_x86_single_step_syscall" />
++        <option name="test-command-line" key="kselftest_x86_syscall_nt" value="cd &ktest_dir;; ./kselftest_x86_syscall_nt" />
++        <option name="test-command-line" key="kselftest_x86_test_mremap_vdso" value="cd &ktest_dir;; ./kselftest_x86_test_mremap_vdso" />
++    </test>
++</configuration>
 diff --git a/tools/testing/selftests/android/config_x86_64.xml b/tools/testing/selftests/android/config_x86_64.xml
 new file mode 100644
 --- /dev/null
diff --git a/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch b/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch
index ab37186e..3561133d 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-Kleaf-Bazel-based-GKI-kernel-build.patch
@@ -22,11 +22,11 @@ Change-Id: I2f06b2b79dbcbf197cb23d68b3c2f6786191e19d
 Signed-off-by: Matthias Maennich <maennich@google.com>
 Signed-off-by: Lee Jones <joneslee@google.com>
 ---
- BUILD.bazel | 2174 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ BUILD.bazel | 2349 +++++++++++++++++++++++++++++++++++++++++++++++++++
  Makefile    |    4 +
- abi.bzl     |  136 ++++
- modules.bzl |  132 ++++
- 4 files changed, 2446 insertions(+)
+ abi.bzl     |  136 +++
+ modules.bzl |  132 +++
+ 4 files changed, 2621 insertions(+)
  create mode 100644 BUILD.bazel
  create mode 100644 abi.bzl
  create mode 100644 modules.bzl
@@ -35,7 +35,7 @@ diff --git a/BUILD.bazel b/BUILD.bazel
 new file mode 100644
 --- /dev/null
 +++ b/BUILD.bazel
-@@ -0,0 +1,2174 @@
+@@ -0,0 +1,2349 @@
 +# SPDX-License-Identifier: GPL-2.0
 +# Copyright (C) 2021 The Android Open Source Project
 +
@@ -1000,11 +1000,23 @@ new file mode 100644
 +)
 +
 +config_setting(
++    name = "i386",
++    values = {"platforms": "//build/kernel/kleaf/impl:android_i386"},
++    visibility = ["//visibility:private"],
++)
++
++config_setting(
 +    name = "arm64",
 +    values = {"platforms": "//build/kernel/kleaf/impl:android_arm64"},
 +    visibility = ["//visibility:private"],
 +)
 +
++config_setting(
++    name = "arm",
++    values = {"platforms": "//build/kernel/kleaf/impl:android_arm"},
++    visibility = ["//visibility:private"],
++)
++
 +cc_library(
 +    name = "kselftest_headers_lib",
 +    hdrs = glob(["tools/testing/selftests/*.h"]),
@@ -1024,7 +1036,9 @@ new file mode 100644
 +    name = "kselftest_breakpoints_breakpoint_test",
 +    srcs = select({
 +        ":x86_64": ["tools/testing/selftests/breakpoints/breakpoint_test.c"],
++        ":i386": ["tools/testing/selftests/breakpoints/breakpoint_test.c"],
 +        ":arm64": ["tools/testing/selftests/breakpoints/breakpoint_test_arm64.c"],
++        "//conditions:default": [],
 +    }),
 +    path_prefix = _KSELFTEST_DIR,
 +    target_compatible_with = ["@platforms//os:android"],
@@ -1909,7 +1923,10 @@ new file mode 100644
 +        "tools/testing/selftests/x86/helpers.h",
 +        "tools/testing/selftests/x86/single_step_syscall.c",
 +    ],
-+    abis = ["x86_64"],
++    abis = [
++        "x86_64",
++        "x86",
++    ],
 +    copts = [
 +        "-std=gnu99",
 +        "-O2",
@@ -1931,7 +1948,10 @@ new file mode 100644
 +        "tools/testing/selftests/x86/helpers.h",
 +        "tools/testing/selftests/x86/syscall_nt.c",
 +    ],
-+    abis = ["x86_64"],
++    abis = [
++        "x86_64",
++        "x86",
++    ],
 +    copts = [
 +        "-std=gnu99",
 +        "-O2",
@@ -1953,7 +1973,10 @@ new file mode 100644
 +        "tools/testing/selftests/x86/helpers.h",
 +        "tools/testing/selftests/x86/ptrace_syscall.c",
 +    ],
-+    abis = ["x86_64"],
++    abis = [
++        "x86_64",
++        "x86",
++    ],
 +    copts = [
 +        "-std=gnu99",
 +        "-O2",
@@ -1975,7 +1998,10 @@ new file mode 100644
 +        "tools/testing/selftests/x86/helpers.h",
 +        "tools/testing/selftests/x86/test_mremap_vdso.c",
 +    ],
-+    abis = ["x86_64"],
++    abis = [
++        "x86_64",
++        "x86",
++    ],
 +    copts = [
 +        "-std=gnu99",
 +        "-O2",
@@ -1997,7 +2023,10 @@ new file mode 100644
 +        "tools/testing/selftests/x86/check_initial_reg_state.c",
 +        "tools/testing/selftests/x86/helpers.h",
 +    ],
-+    abis = ["x86_64"],
++    abis = [
++        "x86_64",
++        "x86",
++    ],
 +    copts = [
 +        "-std=gnu99",
 +        "-O2",
@@ -2023,7 +2052,10 @@ new file mode 100644
 +        "tools/testing/selftests/x86/helpers.h",
 +        "tools/testing/selftests/x86/ldt_gdt.c",
 +    ],
-+    abis = ["x86_64"],
++    abis = [
++        "x86_64",
++        "x86",
++    ],
 +    copts = [
 +        "-std=gnu99",
 +        "-O2",
@@ -2043,7 +2075,9 @@ new file mode 100644
 +    name = "kselftest_gen_config",
 +    src = select({
 +        ":x86_64": "tools/testing/selftests/android/config_x86_64.xml",
++        ":i386": "tools/testing/selftests/android/config_x86.xml",
 +        ":arm64": "tools/testing/selftests/android/config_arm64.xml",
++        ":arm": "tools/testing/selftests/android/config_arm.xml",
 +    }),
 +    out = _KSELFTEST_DIR + "/selftests.config",
 +    visibility = ["//visibility:private"],
@@ -2121,6 +2155,141 @@ new file mode 100644
 +)
 +
 +android_filegroup(
++    name = "kselftest_tests_x86",
++    srcs = [
++        ":kselftest_binderfs_binderfs_test_x86",
++        ":kselftest_breakpoints_breakpoint_test_x86",
++        ":kselftest_capabilities_test_execve_x86",
++        ":kselftest_capabilities_validate_cap_x86",
++        ":kselftest_futex_futex_requeue_pi_mismatched_ops_x86",
++        ":kselftest_futex_futex_requeue_pi_signal_restart_x86",
++        ":kselftest_futex_futex_requeue_pi_x86",
++        ":kselftest_futex_futex_requeue_x86",
++        ":kselftest_futex_futex_wait_private_mapped_file_x86",
++        ":kselftest_futex_futex_wait_timeout_x86",
++        ":kselftest_futex_futex_wait_uninitialized_heap_x86",
++        ":kselftest_futex_futex_wait_wouldblock_x86",
++        ":kselftest_futex_futex_wait_x86",
++        ":kselftest_gen_config",
++        ":kselftest_kcmp_kcmp_test_x86",
++        ":kselftest_mm_compaction_test_x86",
++        ":kselftest_mm_hugepage_mmap_x86",
++        ":kselftest_mm_hugepage_shm_x86",
++        ":kselftest_mm_map_hugetlb_x86",
++        ":kselftest_mm_mlock2_tests_x86",
++        ":kselftest_mm_mlock_random_test_x86",
++        ":kselftest_mm_mremap_dontunmap_x86",
++        ":kselftest_mm_mremap_test_x86",
++        ":kselftest_mm_on_fault_limit_x86",
++        ":kselftest_mm_thuge_gen_x86",
++        ":kselftest_mm_transhuge_stress_x86",
++        ":kselftest_mm_uffd_unit_tests_x86",
++        ":kselftest_net_psock_tpacket_x86",
++        ":kselftest_net_reuseaddr_conflict_x86",
++        ":kselftest_net_socket_x86",
++        ":kselftest_ptrace_peeksiginfo_x86",
++        ":kselftest_rtc_rtctest_x86",
++        ":kselftest_seccomp_seccomp_bpf_x86",
++        ":kselftest_size_test_get_size_x86",
++        ":kselftest_timers_adjtick_x86",
++        ":kselftest_timers_alarmtimer_suspend_x86",
++        ":kselftest_timers_change_skew_x86",
++        ":kselftest_timers_clocksource_switch_x86",
++        ":kselftest_timers_freq_step_x86",
++        ":kselftest_timers_inconsistency_check_x86",
++        ":kselftest_timers_leap_a_day_x86",
++        ":kselftest_timers_leapcrash_x86",
++        ":kselftest_timers_nanosleep_x86",
++        ":kselftest_timers_nsleep_lat_x86",
++        ":kselftest_timers_posix_timers_x86",
++        ":kselftest_timers_set_2038_x86",
++        ":kselftest_timers_set_tai_x86",
++        ":kselftest_timers_set_timer_lat_x86",
++        ":kselftest_timers_set_tz_x86",
++        ":kselftest_timers_skew_consistency_x86",
++        ":kselftest_timers_tests_raw_skew_x86",
++        ":kselftest_timers_threadtest_x86",
++        ":kselftest_timers_valid_adjtimex_x86",
++        ":kselftest_vdso_vdso_test_abi_x86",
++        ":kselftest_vdso_vdso_test_clock_getres_x86",
++        ":kselftest_vdso_vdso_test_getcpu_x86",
++        ":kselftest_vdso_vdso_test_gettimeofday_x86",
++        ":kselftest_x86_check_initial_reg_state_x86",
++        ":kselftest_x86_ldt_gdt_x86",
++        ":kselftest_x86_ptrace_syscall_x86",
++        ":kselftest_x86_single_step_syscall_x86",
++        ":kselftest_x86_syscall_nt_x86",
++        ":kselftest_x86_test_mremap_vdso_x86",
++    ],
++    cpu = "i386",
++    visibility = ["//visibility:private"],
++)
++
++android_filegroup(
++    name = "kselftest_tests_arm",
++    srcs = [
++        ":kselftest_binderfs_binderfs_test_arm",
++        ":kselftest_capabilities_test_execve_arm",
++        ":kselftest_capabilities_validate_cap_arm",
++        ":kselftest_futex_futex_requeue_arm",
++        ":kselftest_futex_futex_requeue_pi_arm",
++        ":kselftest_futex_futex_requeue_pi_mismatched_ops_arm",
++        ":kselftest_futex_futex_requeue_pi_signal_restart_arm",
++        ":kselftest_futex_futex_wait_arm",
++        ":kselftest_futex_futex_wait_private_mapped_file_arm",
++        ":kselftest_futex_futex_wait_timeout_arm",
++        ":kselftest_futex_futex_wait_uninitialized_heap_arm",
++        ":kselftest_futex_futex_wait_wouldblock_arm",
++        ":kselftest_gen_config",
++        ":kselftest_kcmp_kcmp_test_arm",
++        ":kselftest_mm_compaction_test_arm",
++        ":kselftest_mm_hugepage_mmap_arm",
++        ":kselftest_mm_hugepage_shm_arm",
++        ":kselftest_mm_map_hugetlb_arm",
++        ":kselftest_mm_mlock2_tests_arm",
++        #":kselftest_mm_mlock_random_test_arm",
++        ":kselftest_mm_mremap_dontunmap_arm",
++        ":kselftest_mm_mremap_test_arm",
++        ":kselftest_mm_on_fault_limit_arm",
++        ":kselftest_mm_thuge_gen_arm",
++        ":kselftest_mm_transhuge_stress_arm",
++        ":kselftest_mm_uffd_unit_tests_arm",
++        #":kselftest_net_psock_tpacket_arm",
++        ":kselftest_net_reuseaddr_conflict_arm",
++        ":kselftest_net_socket_arm",
++        ":kselftest_ptrace_peeksiginfo_arm",
++        ":kselftest_rtc_rtctest_arm",
++        #":kselftest_seccomp_seccomp_bpf_arm",
++        ":kselftest_size_test_get_size_arm",
++        ":kselftest_timers_adjtick_arm",
++        ":kselftest_timers_alarmtimer_suspend_arm",
++        ":kselftest_timers_change_skew_arm",
++        ":kselftest_timers_clocksource_switch_arm",
++        #":kselftest_timers_freq_step_arm",
++        ":kselftest_timers_inconsistency_check_arm",
++        ":kselftest_timers_leap_a_day_arm",
++        ":kselftest_timers_leapcrash_arm",
++        ":kselftest_timers_nanosleep_arm",
++        ":kselftest_timers_nsleep_lat_arm",
++        ":kselftest_timers_posix_timers_arm",
++        ":kselftest_timers_set_2038_arm",
++        ":kselftest_timers_set_tai_arm",
++        ":kselftest_timers_set_timer_lat_arm",
++        ":kselftest_timers_set_tz_arm",
++        ":kselftest_timers_skew_consistency_arm",
++        ":kselftest_timers_tests_raw_skew_arm",
++        ":kselftest_timers_threadtest_arm",
++        ":kselftest_timers_valid_adjtimex_arm",
++        ":kselftest_vdso_vdso_test_abi_arm",
++        ":kselftest_vdso_vdso_test_clock_getres_arm",
++        ":kselftest_vdso_vdso_test_getcpu_arm",
++        ":kselftest_vdso_vdso_test_gettimeofday_arm",
++    ],
++    cpu = "arm",
++    visibility = ["//visibility:private"],
++)
++
++android_filegroup(
 +    name = "kselftest_tests_arm64",
 +    srcs = [
 +        ":kselftest_binderfs_binderfs_test_arm64",
@@ -2187,13 +2356,19 @@ new file mode 100644
 +
 +zip_archive(
 +    name = "tests_zip_x86_64",
-+    srcs = [":kselftest_tests_x86_64"],
++    srcs = [
++        ":kselftest_tests_x86",
++        ":kselftest_tests_x86_64",
++    ],
 +    out = "tests.zip",
 +)
 +
 +zip_archive(
 +    name = "tests_zip_arm64",
-+    srcs = [":kselftest_tests_arm64"],
++    srcs = [
++        ":kselftest_tests_arm",
++        ":kselftest_tests_arm64",
++    ],
 +    out = "tests.zip",
 +)
 +
@@ -2242,7 +2417,7 @@ new file mode 100644
 +
 +visibility("private")
 +
-+_ALL_ABIS = ["arm64", "x86_64"]
++_ALL_ABIS = ["arm", "arm64", "x86", "x86_64"]
 +
 +def _copy_with_abi(
 +        name,
diff --git a/android-mainline/NOUPSTREAM-ANDROID-build.config.-file-hierarchy.patch b/android-mainline/NOUPSTREAM-ANDROID-build.config.-file-hierarchy.patch
index 52ddd8a2..19bab848 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-build.config.-file-hierarchy.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-build.config.-file-hierarchy.patch
@@ -25,7 +25,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
  build.config.crashdump            |  1 +
  build.config.crashdump.aarch64    |  7 ++++++
  build.config.crashdump.x86_64     |  7 ++++++
- build.config.db845c               | 14 ++++++++++++
+ build.config.db845c               | 16 +++++++++++++
  build.config.gki                  |  2 ++
  build.config.gki.aarch64          | 21 +++++++++++++++++
  build.config.gki.riscv64          | 21 +++++++++++++++++
@@ -46,7 +46,7 @@ Signed-off-by: Lee Jones <joneslee@google.com>
  build.config.riscv64              | 14 ++++++++++++
  build.config.rockpi4              | 18 +++++++++++++++
  build.config.x86_64               | 16 +++++++++++++
- 33 files changed, 358 insertions(+)
+ 33 files changed, 360 insertions(+)
  create mode 100644 build.config.aarch64
  create mode 100644 build.config.allmodconfig
  create mode 100644 build.config.allmodconfig.aarch64
@@ -282,7 +282,7 @@ diff --git a/build.config.db845c b/build.config.db845c
 new file mode 100644
 --- /dev/null
 +++ b/build.config.db845c
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,16 @@
 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 +
@@ -292,6 +292,8 @@ new file mode 100644
 +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
 +POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 +
++DTC_FLAGS="${DTC_FLAGS} -@"
++
 +FILES="
 +arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
 +arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
diff --git a/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch b/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch
index ab800a41..a55c1597 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch
@@ -24,13 +24,13 @@ Signed-off-by: Lee Jones <joneslee@google.com>
  arch/arm64/configs/16k_gki.fragment     |   3 +
  arch/arm64/configs/crashdump_defconfig  |  81 +++
  arch/arm64/configs/db845c_gki.fragment  |  14 +-
- arch/arm64/configs/gki_defconfig        | 711 ++++++++++++++++++++++++
+ arch/arm64/configs/gki_defconfig        | 712 ++++++++++++++++++++++++
  arch/arm64/configs/microdroid_defconfig | 216 +++++++
- arch/riscv/configs/gki_defconfig        | 649 +++++++++++++++++++++
+ arch/riscv/configs/gki_defconfig        | 651 ++++++++++++++++++++++
  arch/x86/configs/crashdump_defconfig    |  87 +++
- arch/x86/configs/gki_defconfig          | 659 ++++++++++++++++++++++
+ arch/x86/configs/gki_defconfig          | 660 ++++++++++++++++++++++
  arch/x86/configs/microdroid_defconfig   | 290 ++++++++++
- 9 files changed, 2707 insertions(+), 3 deletions(-)
+ 9 files changed, 2711 insertions(+), 3 deletions(-)
  create mode 100644 arch/arm64/configs/16k_gki.fragment
  create mode 100644 arch/arm64/configs/crashdump_defconfig
  create mode 100644 arch/arm64/configs/gki_defconfig
@@ -194,7 +194,7 @@ diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
 new file mode 100644
 --- /dev/null
 +++ b/arch/arm64/configs/gki_defconfig
-@@ -0,0 +1,711 @@
+@@ -0,0 +1,712 @@
 +CONFIG_UAPI_HEADER_TEST=y
 +CONFIG_AUDIT=y
 +CONFIG_NO_HZ=y
@@ -776,6 +776,7 @@ new file mode 100644
 +CONFIG_QUOTA=y
 +CONFIG_QFMT_V2=y
 +CONFIG_FUSE_FS=y
++CONFIG_VIRTIO_FS=y
 +CONFIG_OVERLAY_FS=y
 +CONFIG_INCREMENTAL_FS=y
 +CONFIG_MSDOS_FS=y
@@ -1131,7 +1132,7 @@ diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
 new file mode 100644
 --- /dev/null
 +++ b/arch/riscv/configs/gki_defconfig
-@@ -0,0 +1,649 @@
+@@ -0,0 +1,651 @@
 +CONFIG_AUDIT=y
 +CONFIG_NO_HZ=y
 +CONFIG_HIGH_RES_TIMERS=y
@@ -1197,6 +1198,7 @@ new file mode 100644
 +CONFIG_KVM=y
 +CONFIG_KPROBES=y
 +CONFIG_JUMP_LABEL=y
++CONFIG_SHADOW_CALL_STACK=y
 +CONFIG_CFI_CLANG=y
 +CONFIG_MODULES=y
 +CONFIG_MODULE_UNLOAD=y
@@ -1660,6 +1662,7 @@ new file mode 100644
 +CONFIG_QUOTA=y
 +CONFIG_QFMT_V2=y
 +CONFIG_FUSE_FS=y
++CONFIG_VIRTIO_FS=y
 +CONFIG_OVERLAY_FS=y
 +CONFIG_INCREMENTAL_FS=y
 +CONFIG_MSDOS_FS=y
@@ -1877,7 +1880,7 @@ diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
 new file mode 100644
 --- /dev/null
 +++ b/arch/x86/configs/gki_defconfig
-@@ -0,0 +1,659 @@
+@@ -0,0 +1,660 @@
 +CONFIG_UAPI_HEADER_TEST=y
 +CONFIG_KERNEL_LZ4=y
 +CONFIG_AUDIT=y
@@ -2411,6 +2414,7 @@ new file mode 100644
 +CONFIG_QUOTA=y
 +CONFIG_QFMT_V2=y
 +CONFIG_FUSE_FS=y
++CONFIG_VIRTIO_FS=y
 +CONFIG_OVERLAY_FS=y
 +CONFIG_INCREMENTAL_FS=y
 +CONFIG_MSDOS_FS=y
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