diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-03-21 10:02:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-03-21 10:02:36 +0300 |
| commit | f6472b17933f9adb825e7c7da31f7b7b2edb1950 (patch) | |
| tree | 84cca5e27843ed65fd49e62352d0a1de582470be /scripts/package | |
| parent | 763aacf86f1baefb134c70813aa8c72d1675d738 (diff) | |
| parent | f338e77383789c0cae23ca3d48adcc5e9e137e3c (diff) | |
| download | linux-f6472b17933f9adb825e7c7da31f7b7b2edb1950.tar.xz | |
Merge tag 'v7.0-rc4' into timers/core, to resolve conflict
Resolve conflict between this change in the upstream kernel:
4c652a47722f ("rseq: Mark rseq_arm_slice_extension_timer() __always_inline")
... and this pending change in timers/core:
0e98eb14814e ("entry: Prepare for deferred hrtimer rearming")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/install-extmod-build | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/package/install-extmod-build b/scripts/package/install-extmod-build index 2576cf7902db..f12e1ffe409e 100755 --- a/scripts/package/install-extmod-build +++ b/scripts/package/install-extmod-build @@ -32,6 +32,10 @@ mkdir -p "${destdir}" echo tools/objtool/objtool fi + if is_enabled CONFIG_DEBUG_INFO_BTF_MODULES; then + echo tools/bpf/resolve_btfids/resolve_btfids + fi + echo Module.symvers echo "arch/${SRCARCH}/include/generated" echo include/config/auto.conf |