Most of this is just resolving the same conflicts Salvatore already handled locally. "x86/ioapic: Don't let setaffinity unmask threaded EOI interrupt too early" was refreshed instead of being dropped.