From: Al Viro <viro@zeniv.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Christian Brauner <brauner@kernel.org>,
Aleksa Sarai <cyphar@cyphar.com>, 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: manual merge of the bpf-next tree with the vfs-brauner tree
Date: Wed, 14 Aug 2024 02:48:40 +0100 [thread overview]
Message-ID: <20240814014840.GN13701@ZenIV> (raw)
In-Reply-To: <20240814105629.0ad9631b@canb.auug.org.au>
On Wed, Aug 14, 2024 at 10:56:29AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> fs/coda/inode.c
>
> between commit:
>
> 626c2be9822d ("coda: use param->file for FSCONFIG_SET_FD")
FWIW, I'm not sure that FSCONFIG_SET_FD is a good idea, seeing
that it went without a single user for 6 years and this case
does not look convincing.
Oh, well - too late for that, by 8 years or so...
next prev parent reply other threads:[~2024-08-14 1:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 0:56 linux-next: manual merge of the bpf-next tree with the vfs-brauner tree Stephen Rothwell
2024-08-14 1:48 ` Al Viro [this message]
2024-09-15 23:42 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-06-27 2:12 Stephen Rothwell
2025-06-27 2:17 ` Alexei Starovoitov
2025-06-27 7:50 ` Stephen Rothwell
2026-06-04 12:59 Mark Brown
2026-06-04 18:14 ` Daniel Borkmann
2026-06-08 11:25 Mark Brown
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=20240814014840.GN13701@ZenIV \
--to=viro@zeniv.linux.org.uk \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=cyphar@cyphar.com \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.