aosp/android-mainline: update series

up to 2597aed6bcec2 ("ANDROID: Update license for selftest build and configs")

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: If5fb70b1cb793c0520f1b7c972688471e3cebd93

3 files changed, 13 insertions, 39 deletions

diff --git a/android-mainline/ANDROID-tools-Miscellaneous.patch b/android-mainline/ANDROID-tools-Miscellaneous.patch
index 9630c3af..a6fca29f 100644
--- a/android-mainline/ANDROID-tools-Miscellaneous.patch
+++ b/android-mainline/ANDROID-tools-Miscellaneous.patch
@@ -9,9 +9,9 @@ Change-Id: Ic155709fbf07ec0575fa2fa954ee199e63051a97
  tools/testing/android/OWNERS                  |  4 +
  tools/testing/android/bin/acloudb.sh          | 43 +++++++++++
  tools/testing/android/bin/kselftest.sh        | 76 +++++++++++++++++++
- .../selftests/android/config_arm64.xml        | 63 +++++++++++++++
- .../selftests/android/config_x86_64.xml       | 63 +++++++++++++++
- 5 files changed, 249 insertions(+)
+ .../selftests/android/config_arm64.xml        | 55 ++++++++++++++
+ .../selftests/android/config_x86_64.xml       | 55 ++++++++++++++
+ 5 files changed, 233 insertions(+)
  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
@@ -160,18 +160,10 @@ diff --git a/tools/testing/selftests/android/config_arm64.xml b/tools/testing/se
 new file mode 100644
 --- /dev/null
 +++ b/tools/testing/selftests/android/config_arm64.xml
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,55 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!-- Copyright (C) 2023 The Android Open Source Project
-+     Licensed under the Apache License, Version 2.0 (the "License");
-+     you may not use this file except in compliance with the License.
-+     You may obtain a copy of the License at
-+          http://www.apache.org/licenses/LICENSE-2.0
-+     Unless required by applicable law or agreed to in writing, software
-+     distributed under the License is distributed on an "AS IS" BASIS,
-+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+     See the License for the specific language governing permissions and
-+     limitations under the License.
++SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
 +-->
 +<configuration description="kselftest">
 +    <option name="test-suite-tag" value="kernel-test" />
@@ -228,18 +220,10 @@ diff --git a/tools/testing/selftests/android/config_x86_64.xml b/tools/testing/s
 new file mode 100644
 --- /dev/null
 +++ b/tools/testing/selftests/android/config_x86_64.xml
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,55 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!-- Copyright (C) 2023 The Android Open Source Project
-+     Licensed under the Apache License, Version 2.0 (the "License");
-+     you may not use this file except in compliance with the License.
-+     You may obtain a copy of the License at
-+          http://www.apache.org/licenses/LICENSE-2.0
-+     Unless required by applicable law or agreed to in writing, software
-+     distributed under the License is distributed on an "AS IS" BASIS,
-+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+     See the License for the specific language governing permissions and
-+     limitations under the License.
++SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
 +-->
 +<configuration description="kselftest">
 +    <option name="test-suite-tag" value="kernel-test" />
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 782dbe4d..e5c54e93 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
@@ -24,9 +24,9 @@ Signed-off-by: Lee Jones <joneslee@google.com>
 ---
  BUILD.bazel | 1947 +++++++++++++++++++++++++++++++++++++++++++++++++++
  Makefile    |    4 +
- abi.bzl     |  146 ++++
+ abi.bzl     |  136 ++++
  modules.bzl |  132 ++++
- 4 files changed, 2229 insertions(+)
+ 4 files changed, 2219 insertions(+)
  create mode 100644 BUILD.bazel
  create mode 100644 abi.bzl
  create mode 100644 modules.bzl
@@ -2001,20 +2001,10 @@ diff --git a/abi.bzl b/abi.bzl
 new file mode 100644
 --- /dev/null
 +++ b/abi.bzl
-@@ -0,0 +1,146 @@
+@@ -0,0 +1,136 @@
++# SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
 +# Copyright (C) 2023 The Android Open Source Project
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+#       http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
++
 +"""
 +ABI aware build rules.
 +"""
diff --git a/android-mainline/series b/android-mainline/series
index e0ff5348..6ab846d2 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -2,7 +2,7 @@
 # android-mainline patches
 #
 # Applies onto upstream f9ae180416e04 Linux v6.6-6789-gf9ae180416e04
-# Matches android-mainline 804ee293f248a ("Merge f9ae180416e0 ("Merge tag 'for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline")
+# Matches android-mainline 2597aed6bcec2 ("ANDROID: Update license for selftest build and configs")
 # Status: Tested
 #
 Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch