Messages in this thread | | | Date | Tue, 27 Jun 2023 13:46:45 +0200 | From | Ingo Molnar <> | Subject | Re: [GIT PULL] objtool changes for v6.5 |
| |
* Ingo Molnar <mingo@kernel.org> wrote:
> Linus, > > Please pull the latest objtool/core git tree from: > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git objtool-core-2023-06-27 > > # HEAD: 301cf77e21317b3465c5e2bb0188df24bbf1c2e2 x86/orc: Make the is_callthunk() definition depend on CONFIG_BPF_JIT=y
I forgot to mention that there's a new conflict when you merge this, in tools/objtool/check.c, plus a semantic conflict in the new tools/objtool/noreturns.h file - to remove the 'btrfs_assertfail' entry from the new tools/objtool/noreturns.h file.
Our -tip CI conflict resolution can be double checked here:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/merge
Thanks,
Ingo
| |