From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Andrii Nakryiko <andrii@kernel•org>,
Christian Brauner <brauner@kernel•org>
Cc: Al Viro <viro@zeniv•linux.org.uk>,
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: linux-next: manual merge of the bpf-next tree with the vfs-brauner tree
Date: Wed, 14 Aug 2024 10:56:29 +1000 [thread overview]
Message-ID: <20240814105629.0ad9631b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 795 bytes --]
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")
from the vfs-brauner tree and commit:
1da91ea87aef ("introduce fd_file(), convert all accessors to it.")
from the bpf-next tree.
I fixed it up (the former removed the code modified by the latter, so I
used the former) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-14 0:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 0:56 Stephen Rothwell [this message]
2024-08-14 1:48 ` linux-next: manual merge of the bpf-next tree with the vfs-brauner tree Al Viro
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
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=20240814105629.0ad9631b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=brauner@kernel$(echo .)org \
--cc=cyphar@cyphar$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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