From 3443c270f3b7cf97525c30e461dd5f957d51e31e Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Mon, 8 Sep 2025 14:18:46 -0700 Subject: [PATCH 1/2] patches: Remove android15-6.6 The single patch we were applying has now come in via a stable merge so drop our copy of the change. Link: https://android.googlesource.com/kernel/common/+/67ac45176dfdefbde966fcb1a4a9360ec1dde1db Signed-off-by: Nathan Chancellor --- ...71a3afe81531b3ace96bd151a372dda3ee25.patch | 46 ------------------- patches/android15-6.6/series | 1 - 2 files changed, 47 deletions(-) delete mode 100644 patches/android15-6.6/1ed171a3afe81531b3ace96bd151a372dda3ee25.patch delete mode 100644 patches/android15-6.6/series diff --git a/patches/android15-6.6/1ed171a3afe81531b3ace96bd151a372dda3ee25.patch b/patches/android15-6.6/1ed171a3afe81531b3ace96bd151a372dda3ee25.patch deleted file mode 100644 index 0a3bbf8d..00000000 --- a/patches/android15-6.6/1ed171a3afe81531b3ace96bd151a372dda3ee25.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ed171a3afe81531b3ace96bd151a372dda3ee25 Mon Sep 17 00:00:00 2001 -From: Nathan Chancellor -Date: Tue, 15 Jul 2025 20:19:44 -0700 -Subject: tracing/probes: Avoid using params uninitialized in parse_btf_arg() - -After a recent change in clang to strengthen uninitialized warnings [1], -it points out that in one of the error paths in parse_btf_arg(), params -is used uninitialized: - - kernel/trace/trace_probe.c:660:19: warning: variable 'params' is uninitialized when used here [-Wuninitialized] - 660 | return PTR_ERR(params); - | ^~~~~~ - -Match many other NO_BTF_ENTRY error cases and return -ENOENT, clearing -up the warning. - -Link: https://lore.kernel.org/all/20250715-trace_probe-fix-const-uninit-warning-v1-1-98960f91dd04@kernel.org/ - -Cc: stable@vger.kernel.org -Closes: https://github.com/ClangBuiltLinux/linux/issues/2110 -Fixes: d157d7694460 ("tracing/probes: Support BTF field access from $retval") -Link: https://github.com/llvm/llvm-project/commit/2464313eef01c5b1edf0eccf57a32cdee01472c7 [1] -Signed-off-by: Nathan Chancellor -Signed-off-by: Masami Hiramatsu (Google) ---- -Link: https://git.kernel.org/linus/1ed171a3afe81531b3ace96bd151a372dda3ee25 ---- - kernel/trace/trace_probe.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c -index 424751cdf31f9f..40830a3ecd96c0 100644 ---- a/kernel/trace/trace_probe.c -+++ b/kernel/trace/trace_probe.c -@@ -657,7 +657,7 @@ static int parse_btf_arg(char *varname, - ret = query_btf_context(ctx); - if (ret < 0 || ctx->nr_params == 0) { - trace_probe_log_err(ctx->offset, NO_BTF_ENTRY); -- return PTR_ERR(params); -+ return -ENOENT; - } - } - params = ctx->params; --- -cgit 1.2.3-korg - diff --git a/patches/android15-6.6/series b/patches/android15-6.6/series deleted file mode 100644 index edfa00f6..00000000 --- a/patches/android15-6.6/series +++ /dev/null @@ -1 +0,0 @@ -1ed171a3afe81531b3ace96bd151a372dda3ee25.patch From ebe7cb0d85da57eea581810196995da548fd5482 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Mon, 8 Sep 2025 14:24:06 -0700 Subject: [PATCH 2/2] ci: Regenerate GitHub Actions workflow and TuxSuite files Signed-off-by: Nathan Chancellor --- .github/workflows/android15-6.6-clang-18.yml | 4 ++-- .github/workflows/android15-6.6-clang-19.yml | 4 ++-- .github/workflows/android15-6.6-clang-20.yml | 4 ++-- .github/workflows/android15-6.6-clang-21.yml | 4 ++-- .github/workflows/android15-6.6-clang-22.yml | 4 ++-- tuxsuite/android15-6.6-clang-18.tux.yml | 3 +-- tuxsuite/android15-6.6-clang-19.tux.yml | 3 +-- tuxsuite/android15-6.6-clang-20.tux.yml | 3 +-- tuxsuite/android15-6.6-clang-21.tux.yml | 3 +-- tuxsuite/android15-6.6-clang-22.tux.yml | 3 +-- 10 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/android15-6.6-clang-18.yml b/.github/workflows/android15-6.6-clang-18.yml index bd5d1623..ab4334ce 100644 --- a/.github/workflows/android15-6.6-clang-18.yml +++ b/.github/workflows/android15-6.6-clang-18.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-18.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-18.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-18.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json tuxsuite/android15-6.6-clang-18.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/.github/workflows/android15-6.6-clang-19.yml b/.github/workflows/android15-6.6-clang-19.yml index ec054dd2..20b79a16 100644 --- a/.github/workflows/android15-6.6-clang-19.yml +++ b/.github/workflows/android15-6.6-clang-19.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-19.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-19.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-19.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json tuxsuite/android15-6.6-clang-19.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/.github/workflows/android15-6.6-clang-20.yml b/.github/workflows/android15-6.6-clang-20.yml index d5d29907..4cdb2adb 100644 --- a/.github/workflows/android15-6.6-clang-20.yml +++ b/.github/workflows/android15-6.6-clang-20.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-20.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-20.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-20.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json tuxsuite/android15-6.6-clang-20.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/.github/workflows/android15-6.6-clang-21.yml b/.github/workflows/android15-6.6-clang-21.yml index 8f045fd2..f20a5b43 100644 --- a/.github/workflows/android15-6.6-clang-21.yml +++ b/.github/workflows/android15-6.6-clang-21.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-21.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-21.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-21.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json tuxsuite/android15-6.6-clang-21.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/.github/workflows/android15-6.6-clang-22.yml b/.github/workflows/android15-6.6-clang-22.yml index a348c3f9..5cbb46dd 100644 --- a/.github/workflows/android15-6.6-clang-22.yml +++ b/.github/workflows/android15-6.6-clang-22.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-22.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-22.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-22.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name allconfigs --json-out builds.json tuxsuite/android15-6.6-clang-22.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/tuxsuite/android15-6.6-clang-18.tux.yml b/tuxsuite/android15-6.6-clang-18.tux.yml index 2e624f38..7854a0ce 100644 --- a/tuxsuite/android15-6.6-clang-18.tux.yml +++ b/tuxsuite/android15-6.6-clang-18.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android15-6.6 # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-18.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-18.tux.yml # Invoke locally via: # $ git clone -b android15-6.6 --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android15-6.6 # $ scripts/build-local.py -C linux -f tuxsuite/android15-6.6-clang-18.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android15-6.6 diff --git a/tuxsuite/android15-6.6-clang-19.tux.yml b/tuxsuite/android15-6.6-clang-19.tux.yml index 26435fcb..f5ff6902 100644 --- a/tuxsuite/android15-6.6-clang-19.tux.yml +++ b/tuxsuite/android15-6.6-clang-19.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android15-6.6 # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-19.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-19.tux.yml # Invoke locally via: # $ git clone -b android15-6.6 --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android15-6.6 # $ scripts/build-local.py -C linux -f tuxsuite/android15-6.6-clang-19.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android15-6.6 diff --git a/tuxsuite/android15-6.6-clang-20.tux.yml b/tuxsuite/android15-6.6-clang-20.tux.yml index 45635c21..89a66e6c 100644 --- a/tuxsuite/android15-6.6-clang-20.tux.yml +++ b/tuxsuite/android15-6.6-clang-20.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android15-6.6 # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-20.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-20.tux.yml # Invoke locally via: # $ git clone -b android15-6.6 --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android15-6.6 # $ scripts/build-local.py -C linux -f tuxsuite/android15-6.6-clang-20.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android15-6.6 diff --git a/tuxsuite/android15-6.6-clang-21.tux.yml b/tuxsuite/android15-6.6-clang-21.tux.yml index 76b726b0..27ac87d1 100644 --- a/tuxsuite/android15-6.6-clang-21.tux.yml +++ b/tuxsuite/android15-6.6-clang-21.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android15-6.6 # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-21.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-21.tux.yml # Invoke locally via: # $ git clone -b android15-6.6 --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android15-6.6 # $ scripts/build-local.py -C linux -f tuxsuite/android15-6.6-clang-21.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android15-6.6 diff --git a/tuxsuite/android15-6.6-clang-22.tux.yml b/tuxsuite/android15-6.6-clang-22.tux.yml index 85c6409c..9765cd22 100644 --- a/tuxsuite/android15-6.6-clang-22.tux.yml +++ b/tuxsuite/android15-6.6-clang-22.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android15-6.6 # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json --patch-series patches/android15-6.6 tuxsuite/android15-6.6-clang-22.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android15-6.6 --job-name defconfigs --json-out builds.json tuxsuite/android15-6.6-clang-22.tux.yml # Invoke locally via: # $ git clone -b android15-6.6 --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android15-6.6 # $ scripts/build-local.py -C linux -f tuxsuite/android15-6.6-clang-22.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android15-6.6