diff options
author | 2024-02-14 10:45:07 +0100 | |
---|---|---|
committer | 2024-02-14 10:45:07 +0100 | |
commit | 03c11eb3b16dc0058589751dfd91f254be2be613 (patch) | |
tree | e5f2889212fec0bb0babdce9abd781ab487e246a /arch/x86/lib/inat.c | |
parent | x86/percpu: Use %RIP-relative address in untagged_addr() (diff) | |
parent | Linux 6.8-rc4 (diff) | |
download | linux-03c11eb3b16dc0058589751dfd91f254be2be613.tar.gz linux-03c11eb3b16dc0058589751dfd91f254be2be613.tar.bz2 linux-03c11eb3b16dc0058589751dfd91f254be2be613.zip |
Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch
Conflicts:
arch/x86/include/asm/percpu.h
arch/x86/include/asm/text-patching.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib/inat.c')
0 files changed, 0 insertions, 0 deletions