Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/x86/kernel/alternative.c

between commits:

  ebebe30794d3 ("x86/ibt: Keep IBT disabled during alternative patching")
  872df34d7c51 ("x86/its: Use dynamic thunks for indirect branches")

from Linus' tree and commit:

  db5c68c88c07 ("x86/alternatives: Simplify the #include section")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kernel/alternative.c
index 48fd04e90114,ddbc303e41e3..000000000000
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@@ -1,39 -1,14 +1,17 @@@
  // SPDX-License-Identifier: GPL-2.0-only
  #define pr_fmt(fmt) "SMP alternatives: " fmt
  
- #include <linux/module.h>
- #include <linux/sched.h>
+ #include <linux/mmu_context.h>
  #include <linux/perf_event.h>
- #include <linux/mutex.h>
- #include <linux/list.h>
- #include <linux/stringify.h>
- #include <linux/highmem.h>
- #include <linux/mm.h>
  #include <linux/vmalloc.h>
  #include <linux/memory.h>
- #include <linux/stop_machine.h>
- #include <linux/slab.h>
- #include <linux/kdebug.h>
- #include <linux/kprobes.h>
- #include <linux/mmu_context.h>
- #include <linux/bsearch.h>
- #include <linux/sync_core.h>
 +#include <linux/execmem.h>
+ 
  #include <asm/text-patching.h>
- #include <asm/alternative.h>
- #include <asm/sections.h>
- #include <asm/mce.h>
- #include <asm/nmi.h>
- #include <asm/cacheflush.h>
- #include <asm/tlbflush.h>
  #include <asm/insn.h>
- #include <asm/io.h>
- #include <asm/fixmap.h>
- #include <asm/paravirt.h>
- #include <asm/asm-prototypes.h>
- #include <asm/cfi.h>
+ #include <asm/nmi.h>
 +#include <asm/ibt.h>
 +#include <asm/set_memory.h>
  
  int __read_mostly alternatives_patched;