From: Masami Hiramatsu <mhiramat@kernel.org>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Daniel Borkmann <daniel@iogearbox.net>,
Peter Zijlstra <peterz@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>,
Jakub Kicinski <kuba@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Network Development <netdev@vger.kernel.org>,
bpf <bpf@vger.kernel.org>, Kernel Team <kernel-team@fb.com>
Subject: Re: pull-request: bpf-next 2022-03-21 v2
Date: Wed, 23 Mar 2022 09:26:38 +0900 [thread overview]
Message-ID: <20220323092638.41efcf935ba7727a4727e86e@kernel.org> (raw)
In-Reply-To: <CAADnVQK0OrNHZRj3M8J8cOpyS99guMSc7103Ac+=EUp+8ubgyw@mail.gmail.com>
On Tue, 22 Mar 2022 09:38:07 -0700
Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
> On Tue, Mar 22, 2022 at 7:32 AM Masami Hiramatsu <mhiramat@kernel.org> wrote:
> >
> > Hi Alexei,
> >
> > So after this is merged, would you have a plan to merge the tip tree
> > which has IBT to the bpf-next? Or should I wait for merging this series
> > or IBT(ENDBR) series in Linus tree?
> >
> > If I add the no ENDBR annotation to the x86 rethook trampoline on this
> > bpf-next branch, it will cause a build error...
>
> Right now (after arch bits revert) there are no build errors in bpf-next
> and won't be any after the merge into Linus's tree either.
>
> linux-next is a proxy of what Linus's tree will look like in a few days.
> Please create a single x86 arch patch against linux-next and make sure
> Peter is happy with it.
> We will land that patch at that time.
OK, I'll make that patch on top of linux-next. That will allow us to
build the rethook correctly.
>
> That patch will be pretty much the same as what you had earlier
> with ENDBR annotation. And maybe regs->ss set which is future proofing
> optional bit and not a functional part of the patch.
Thank you,
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2022-03-23 0:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 5:01 pull-request: bpf-next 2022-03-21 v2 Alexei Starovoitov
2022-03-22 14:32 ` Masami Hiramatsu
2022-03-22 16:38 ` Alexei Starovoitov
2022-03-23 0:26 ` Masami Hiramatsu [this message]
2022-03-22 22:50 ` patchwork-bot+netdevbpf
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=20220323092638.41efcf935ba7727a4727e86e@kernel.org \
--to=mhiramat@kernel.org \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
--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