From: Al Viro <viro@zeniv.linux.org.uk>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
David Chinner <david@fromorbit.com>,
"Darrick J. Wong" <djwong@kernel.org>,
linux-xfs@vger.kernel.org, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the bpf-next tree
Date: Fri, 13 Sep 2024 05:43:04 +0100 [thread overview]
Message-ID: <20240913044304.GB2825852@ZenIV> (raw)
In-Reply-To: <CAEf4BzashWCozzD7KetgC0Wya-KqUzj0omguAOt+oUVDzHys=Q@mail.gmail.com>
On Thu, Sep 12, 2024 at 09:26:31PM -0700, Andrii Nakryiko wrote:
> Should I take out the following from bpf-next/for-next for now?
>
> a8e40fd0f127 ("Merge branch 'bpf-next/struct_fd' into for-next")
>
> Al, currently I'm basing my patches on top of your stable-struct_fd
> branch. If you need to update it, I think that's fine, I can rebase on
> top of the updated branch, given my patches weren't yet merged
> anywhere. Let me know.
al@duke:~/linux/trees/temp$ git describe for-next
v6.11-rc1-3-gde12c3391bce
al@duke:~/linux/trees/temp$ git describe stable-struct_fd
v6.11-rc1-3-gde12c3391bce
IOW, #for-next is currently identical to that branch (will grow a merge
shortly); no need to rebase anything.
next prev parent reply other threads:[~2024-09-13 4:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 3:55 linux-next: build failure after merge of the bpf-next tree Stephen Rothwell
2024-09-13 4:00 ` Al Viro
2024-09-13 4:26 ` Andrii Nakryiko
2024-09-13 4:43 ` Al Viro [this message]
2024-09-15 23:30 ` 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=20240913044304.GB2825852@ZenIV \
--to=viro@zeniv.linux.org.uk \
--cc=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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