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.
One part of the patch correspond to df4393424af3 ("x86/ioapic: Prevent
inconsistent state when moving an interrupt") in 5.5-rc1 and which got
backported to 4.19.92.
The other is corresponding to 2579a4eefc04 ("x86/ioapic: Rename misnamed
functions") in 5.5-rc1.