On Tue, Feb 23 2021 at 15:02, Thomas Gleixner wrote: > Linus, > > please pull the latest objtool/core branch from: > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git > objtool-core-2021-02-23 > > up to: aafeb14e9da2: objtool: Support stack-swizzle > > objtool updates: > > - Make objtool work for big-endian cross compiles > > - Make stack tracking via stack pointer memory operations match push/pop > semantics to prepare for architectures w/o PUSH/POP instructions. > > - Add support for analyzing alternatives > > - Improve retpoline detection and handling > > - Improve assembly code coverage on x86 > > - Provide support for inlined stack switching
There is a trivial merge conflict in the XEN assembly code. xen_sysret64 got removed upstream and objtool modifies it. Removal is the way to go. Thanks, tglx