Subject: linux-next: manual merge of the ftrace tree with the vfs-brauner tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 8 Nov 2024 13:55:04 +1100

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  rust/helpers/helpers.c

between commit:

  851849824bb5 ("rust: file: add Rust abstraction for `struct file`")

from the vfs-brauner tree and commit:

  6e59bcc9c8ad ("rust: add static_branch_unlikely for static_key_false")

from the ftrace tree.

I fixed it up (see below) 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

diff --cc rust/helpers/helpers.c
index d553ad9361ce,17e1b60d178f..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -11,9 -11,8 +11,10 @@@
  #include "bug.c"
  #include "build_assert.c"
  #include "build_bug.c"
 +#include "cred.c"
  #include "err.c"
 +#include "fs.c"
+ #include "jump_label.c"
  #include "kunit.c"
  #include "mutex.c"
  #include "page.c"