diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 15:36:43 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 15:36:43 +0300 |
| commit | a3251c1a36f595046bea03935ebe37a1e1f1f1d7 (patch) | |
| tree | 14b51f8bf1d7e1bb35697cb4704255b51b15baa9 /scripts/clang-tools/gen_compile_commands.py | |
| parent | 72f40a2823d6e16229ab58b898c6f22044e5222f (diff) | |
| parent | ab234a260b1f625b26cbefa93ca365b0ae66df33 (diff) | |
| download | linux-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.tar.xz | |
Merge branch 'x86/paravirt' into x86/entry
Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.
Conflicts:
arch/x86/xen/xen-asm.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/clang-tools/gen_compile_commands.py')
| -rwxr-xr-x | scripts/clang-tools/gen_compile_commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/clang-tools/gen_compile_commands.py b/scripts/clang-tools/gen_compile_commands.py index 19963708bcf8..8ddb5d099029 100755 --- a/scripts/clang-tools/gen_compile_commands.py +++ b/scripts/clang-tools/gen_compile_commands.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0 # # Copyright (C) Google LLC, 2018 |