On Wed, Dec 11, 2024, Borislav Petkov wrote: > Btw, Sean, how should we merge this? > > Should I take it all through tip and give you an immutable branch? Hmm, that should work. I don't anticipate any conflicts other than patch 2 (Advertise SRSO_USER_KERNEL_NO to userspace), which is amusingly the most trivial patch. Patch 2 is going to conflict with the CPUID/cpu_caps rework[*], but the conflict won't be hard to resolve, and I'm pretty sure that if I merge in your branch after applying the rework, the merge commit will show an "obviously correct" resolution. Or if I screw it up, an obviously wrong resolution :-) Alternatively, take 1, 3, and 4 through tip, and 2 through my tree, but that seems unnecessarily convoluted. [*] https://lore.kernel.org/all/20241128013424.4096668-40-seanjc@xxxxxxxxxx
