Messages in this thread |  | | Date | Tue, 3 Jan 2023 18:00:46 +0100 | From | Ingo Molnar <> | Subject | Re: [PATCH v14 1/7] x86: lib: Separate instruction decoder MMIO type from MMIO trace |
| |
* Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> On Tue, Jan 03, 2023 at 11:32:14AM +0100, Ingo Molnar wrote: > > > > * Jason A. Donenfeld <Jason@zx2c4.com> wrote: > > > > > Both mmiotrace.h and insn-eval.h define various MMIO_ enum constants. > > > Rename the insn ones to have a INSN_ prefix, so that the headers can be > > > used from the same source file. > > > > > > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> > > > --- > > > arch/x86/coco/tdx/tdx.c | 26 +++++++++++++------------- > > > arch/x86/include/asm/insn-eval.h | 18 +++++++++--------- > > > arch/x86/kernel/sev.c | 18 +++++++++--------- > > > arch/x86/lib/insn-eval.c | 20 ++++++++++---------- > > > 4 files changed, 41 insertions(+), 41 deletions(-) > > > > FYI, I've applied this fix to tip:x86/asm, as the fix for the namespace > > clash makes sense independently of the vDSO getrandom feature. > > I guess you missed the conversation with Borislav yesterday about that. > He mentioned that I'd just take it through random.git when this whole > series goes in.
Please base your tree off on tip:x86/asm then (or pull it in) - it only includes this patch and another trivial patch at:
a0e3aa8fe6cb ("x86/insn: Avoid namespace clash by separating instruction decoder MMIO type from MMIO trace type")
We often modify these files - roughly ~4 commits to arch/x86/kernel/sev.c alone per cycle on average - and it would be better to avoid conflicts here.
Thanks,
Ingo
|  |