diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-03 09:53:40 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-03 09:57:26 +0300 |
| commit | 6a2bcf9277dcbdef88d514113434b45f8ffc5469 (patch) | |
| tree | af426cf4a48d857dc0dc84d4ba88d059e5f16611 /scripts/bpf_doc.py | |
| parent | b90169b42a6f49ff2fe2e4d4ed0bbcf17fb8f1bf (diff) | |
| parent | 39cd87c4eb2b893354f3b850f916353f2658ae6f (diff) | |
| download | linux-6a2bcf9277dcbdef88d514113434b45f8ffc5469.tar.xz | |
Merge tag 'v6.9-rc2' into x86/percpu, to pick up fixes and resolve conflict
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/bpf_doc.py')
| -rwxr-xr-x | scripts/bpf_doc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py index 4606944984ee..c55878bddfdd 100755 --- a/scripts/bpf_doc.py +++ b/scripts/bpf_doc.py @@ -414,8 +414,8 @@ class PrinterRST(Printer): version = version.stdout.decode().rstrip() except: try: - version = subprocess.run(['make', 'kernelversion'], cwd=linuxRoot, - capture_output=True, check=True) + version = subprocess.run(['make', '-s', '--no-print-directory', 'kernelversion'], + cwd=linuxRoot, capture_output=True, check=True) version = version.stdout.decode().rstrip() except: return 'Linux' |