On Tue, Jan 03, 2023 at 11:32:14AM +0100, Ingo Molnar wrote: > > * Jason A. Donenfeld <Jason@xxxxxxxxx> 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@xxxxxxxxx> > > --- > > 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. (Unless of course you wanted to put this into 6.2? That'd be easiest for me.) Jason