diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-04-02 12:34:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-04-02 12:36:30 +0200 |
| commit | b1f480bc0686e65d5413c035bd13af2ea4888784 (patch) | |
| tree | 55e7ac89ca9e96aed8c7568d032367d88b132b96 /drivers/nvme/target/core.c | |
| parent | e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf (diff) | |
| parent | a331f5fdd36dba1ffb0239a4dfaaf1df91ff1aab (diff) | |
Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semantic conflict
Conflict-merge this main commit in essence:
a89dfde3dc3c: ("x86: Remove dynamic NOP selection")
With this upstream commit:
b90829704780: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")
Semantic merge conflict:
arch/x86/net/bpf_jit_comp.c
- memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);
+ memcpy(prog, x86_nops[5], X86_PATCH_SIZE);
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nvme/target/core.c')
0 files changed, 0 insertions, 0 deletions