On 12.07.24 15:32, Greg KH wrote:
I'm confused, which commit should we add, or should we just revert what we have now?
Sorry for the confusion. Let me try again: 1. efi: memmap: Move manipulation routines into x86 arch tree https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=linux-5.10.y&id=31e0721aeabde29371f624f56ce2f403508527a5 ...breaks the build for ia64, because it requires a header that does not exist before 8ff059b8531f3b98e14f0461859fc7cdd95823e4 for ia64. 2. efi: ia64: move IA64-only declarations to new asm/efi.h header https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8ff059b8531f3b98e14f0461859fc7cdd95823e4 adds this header and fixes the ia64 build, see for example [1]. [1]: https://github.com/linux-ia64/linux-stable-rc/actions/runs/9871144965#summary-27258970494 From my understanding 31e0721aeabde29371f624f56ce2f403508527a5 should not be merged w/o 8ff059b8531f3b98e14f0461859fc7cdd95823e4, which also seems to be the case for all other stable kernels from linux-5.12.y up. So 8ff059b8531f3b98e14f0461859fc7cdd95823e4 should be added, too, if 31e0721aeabde29371f624f56ce2f403508527a5 stays in.
And I thought that ia64 was dead?
No, actually it's alive and well - just currently outside of mainline - but still in the stable kernels up to linux-6.6.y and for newer kernels patched back in. If you want to check on our CI ([2]), all current stable kernels build fine for ia64 and run in Ski - but linux-5.10.y currently only because I manually added 8ff059b8531f3b98e14f0461859fc7cdd95823e4 to the list of patches applied by the CI. [2]: https://github.com/linux-ia64/linux-stable-rc/actions/runs/9901808825 Cheers, Frank
