diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:50:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:50:59 +0100 |
| commit | 8c490b42fe91c10d5756efe56014240c669e7720 (patch) | |
| tree | 305c483f5d51cf9866ab4c75282da89d333247c1 /scripts/patch-kernel | |
| parent | x86/Kconfig: Do not allow CONFIG_X86_X32_ABI=y with llvm-objcopy (diff) | |
| parent | Documentation/x86: Update documentation for SVA (Shared Virtual Addressing) (diff) | |
| download | linux-rng-8c490b42fe91c10d5756efe56014240c669e7720.tar.xz linux-rng-8c490b42fe91c10d5756efe56014240c669e7720.zip | |
Merge branch 'x86/pasid' into x86/core, to resolve conflicts
Conflicts:
tools/objtool/arch/x86/decode.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions