lkml.org 
[lkml]   [2022]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] objtool changes for v5.19

* Ingo Molnar <mingo@kernel.org> wrote:

> 34 files changed, 959 insertions(+), 684 deletions(-)

Note that with your latest tree you'll get 3 new conflicts:

CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh
CONFLICT (content): Merge conflict in scripts/Makefile.build
CONFLICT (content): Merge conflict in arch/x86/Kconfig

If you want to double check, you can find our resolution in tip:x86/merge:

a1df7cc57786 Merge branch 'objtool/core' into x86/merge, to resolve conflicts

At:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/merge # INTERNAL MERGE TREE, DO NOT PULL

Here's the merge description:

===================
The following commits between objtool/core and various x86 branches conflict:

968b493173ac x86/mm: Make DMA memory shared for TD guest
77a512e35db7 x86/boot: Avoid #VE during boot for TDX platforms
65fab5bc033a x86/tdx: Exclude shared bit from __PHYSICAL_MASK
41394e33f3a0 x86/tdx: Extend the confidential computing API to support TDX guests
59bd54a84d15 x86/tdx: Detect running as a TDX guest in early boot
dbae0a934f09 x86/cpu: Remove CONFIG_X86_SMAP and "nosmap"

and:

753da4179d08 objtool: Remove --lto and --vmlinux in favor of --link
489e355b4225 objtool: Add HAVE_NOINSTR_VALIDATION
0f620cefd775 objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"
22102f4559be objtool: Make noinstr hacks optional
4ab7674f5951 objtool: Make jump label hack optional
26e176896a5b objtool: Make static call annotation optional
720644749647 objtool: Make stack validation frame-pointer-specific
03f16cd020eb objtool: Add CONFIG_OBJTOOL
7dce62041ac3 objtool: Make stack validation optional
b51277eb9775 objtool: Ditch subcommands
2daf7faba7de objtool: Reorganize cmdline options
4cdfc11b2836 x86/Kconfig: fix the spelling of 'becoming' in X86_KERNEL_IBT config
4a5de9b76fcb objtool: Enable unreachable warnings for CLANG LTO

Resolve them:

- overlapping modifications
- modifying removed functionality

Conflicts:
arch/x86/Kconfig
scripts/Makefile.build
scripts/link-vmlinux.sh
===================

Thanks,

Ingo

\
 
 \ /
  Last update: 2022-05-24 08:03    [W:0.467 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site