Conflicts: arch/x86/kernel/cpu/microcode/core.c: we have backported microcode refractor, so LTS fix not needed. drivers/block/nbd.c: conflict with nbd_ignore_blksize_set Signed-off-by: Kairui Song <kasong@tencent.com>