netdev - linux-next: manual merge of the bpf-next tree with the vfs-brauner tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240814105629.0ad9631b@canb.auug.org.au>
Date: Wed, 14 Aug 2024 10:56:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Borkmann <daniel@...earbox.net>, Alexei Starovoitov
 <ast@...nel.org>, Andrii Nakryiko <andrii@...nel.org>, Christian Brauner
 <brauner@...nel.org>
Cc: Al Viro <viro@...iv.linux.org.uk>, Aleksa Sarai <cyphar@...har.com>, bpf
 <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the bpf-next tree with the vfs-brauner
 tree

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

Content of type "application/pgp-signature" skipped