From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrii Nakryiko <andrii@kernel.org>,
bpf@vger.kernel.org, netdev@vger.kernel.org,
paul@paul-moore.com, brauner@kernel.org,
linux-fsdevel@vger.kernel.org,
linux-security-module@vger.kernel.org, kernel-team@meta.com
Subject: Re: [GIT PULL] BPF token for v6.8
Date: Sun, 21 Jan 2024 11:36:36 -0800 [thread overview]
Message-ID: <CAEf4BzYTZ0KZYc+zgwSdm6h9i0nQAfM_ne8cdMoPJ36c3yNC1A@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=wg3BUNT1nmisracRWni9LzRYxeanj8sePCjya0HTEnCCQ@mail.gmail.com>
On Sun, Jan 21, 2024 at 11:27 AM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Thu, 18 Jan 2024 at 21:00, Andrii Nakryiko <andrii@kernel.org> wrote:
> >
> > This time I'm sending them as a dedicated PR. Please let me know if you are OK
> > pull them directly now, or whether I should target it for the next merge
> > window. If the latter is decided, would it be OK to land these patches into
> > bpf-next tree and then include them in a usual bpf-next PR batch?
>
> So I was keeping this pending while I dealt with all the other pulls
> (and dealt with the weather-related fallout here too, of course).
>
> I've now looked through this again, and I'm ok with it, but notice
> that it has been rebased in the last couple of days, which doesn't
> make me all that happy doing a last-minute pull in this merge window.
Yes, I understand. BPF token patches change common (internal) parts of
libbpf, and so there were conflicts with other libbpf-side changes in
the bpf tree.
>
> End result: I think this might as well go through the bpf-next tree
> and come next merge window through the usual channels.
Sounds good, I'll route it through bpf-next, then. Thanks!
>
> I think Christian's concerns were sorted out too, but in case I'm
> mistaken, just holler.
I believe they were, yes.
>
> Linus
next prev parent reply other threads:[~2024-01-21 19:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-19 5:00 [GIT PULL] BPF token for v6.8 Andrii Nakryiko
2024-01-19 15:31 ` Andrii Nakryiko
2024-01-21 19:27 ` Linus Torvalds
2024-01-21 19:36 ` Andrii Nakryiko [this message]
2024-01-22 15:25 ` Christian Brauner
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=CAEf4BzYTZ0KZYc+zgwSdm6h9i0nQAfM_ne8cdMoPJ36c3yNC1A@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=kernel-team@meta.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paul@paul-moore.com \
--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;
as well as URLs for NNTP newsgroup(s).