From: Kees Cook <keescook@chromium.org>
To: broonie@kernel.org
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Jiri Olsa <jolsa@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Sami Tolvanen <samitolvanen@google.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: manual merge of the kspp tree with the bpf-next tree
Date: Tue, 27 Sep 2022 12:30:14 -0700 [thread overview]
Message-ID: <202209271229.83AC9BAA0F@keescook> (raw)
In-Reply-To: <20220927190811.514527-1-broonie@kernel.org>
On Tue, Sep 27, 2022 at 08:08:11PM +0100, broonie@kernel.org wrote:
> Hi all,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> tools/objtool/check.c
>
> between commit:
>
> 9440155ccb948 ("ftrace: Add HAVE_DYNAMIC_FTRACE_NO_PATCHABLE")
>
> from the bpf-next tree and commit:
>
> 3c68a92d17add ("objtool: Disable CFI warnings")
>
> from the kspp 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.
>
> diff --cc tools/objtool/check.c
> index fcc4d8ea8cec3,48e18737a2d18..0000000000000
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@@ -4124,7 -4118,7 +4128,8 @@@ static int validate_ibt(struct objtool_
> !strcmp(sec->name, "__ex_table") ||
> !strcmp(sec->name, "__jump_table") ||
> !strcmp(sec->name, "__mcount_loc") ||
> - !strcmp(sec->name, ".kcfi_traps"))
> ++ !strcmp(sec->name, ".kcfi_traps")) ||
> + strstr(sec->name, "__patchable_function_entries"))
> continue;
>
> list_for_each_entry(reloc, &sec->reloc->reloc_list, list)
Thanks, yes; this matches what I had when I did a test merge yesterday
too.
--
Kees Cook
next prev parent reply other threads:[~2022-09-27 19:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 19:08 linux-next: manual merge of the kspp tree with the bpf-next tree broonie
2022-09-27 19:30 ` Kees Cook [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-12 3:41 Stephen Rothwell
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=202209271229.83AC9BAA0F@keescook \
--to=keescook@chromium.org \
--cc=broonie@kernel.org \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=samitolvanen@google.com \
--cc=tglx@linutronix.de \
/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