From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
Josh Poimboeuf <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] objtool changes for v6.5
Date: Tue, 27 Jun 2023 13:46:45 +0200 [thread overview]
Message-ID: <ZJrMJYz285GLB881@gmail.com> (raw)
In-Reply-To: <ZJrGGfFl4MHEeftI@gmail.com>
* 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
next prev parent reply other threads:[~2023-06-27 11:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 11:20 [GIT PULL] objtool changes for v6.5 Ingo Molnar
2023-06-27 11:46 ` Ingo Molnar [this message]
2023-06-28 9:26 ` [PATCH] objtool: Remove btrfs_assertfail() from the noreturn exceptions list Ingo Molnar
2023-06-27 22:26 ` [GIT PULL] objtool changes for v6.5 pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZJrMJYz285GLB881@gmail.com \
--to=mingo@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox