From: Mark Brown <broonie@kernel.org>
To: Christian Brauner <brauner@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the origin tree
Date: Tue, 17 Nov 2026 13:01:32 +0000 [thread overview]
Message-ID: <avxQLGt-FR3f7pEW@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2026 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
kernel/trace/trace_uprobe.c
between commit:
72d3a5cb0cd73 ("tracing/probes: Enable newly appended probe when target event is enabled")
from the origin tree and commit:
44e16d22295bd ("tracing/uprobes: handle errors from resolving the real inode")
from the vfs-brauner 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.
diff --cc kernel/trace/trace_uprobe.c
index fb7991543db7d,34cd4392decfd..0000000000000
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@@ -447,29 -444,8 +448,34 @@@ static bool trace_uprobe_has_same_uprob
return false;
}
+typedef bool (*filter_func_t)(struct uprobe_consumer *self, struct mm_struct *mm);
+
+#ifdef CONFIG_PERF_EVENTS
+static bool uprobe_perf_filter(struct uprobe_consumer *uc, struct mm_struct *mm);
+#else
+#define uprobe_perf_filter NULL
+#endif
+
+static int trace_uprobe_enable(struct trace_uprobe *tu, filter_func_t filter)
+{
- struct inode *inode = d_real_inode(tu->path.dentry);
++ struct inode *inode;
+ struct uprobe *uprobe;
+
++ inode = d_real_data_inode(tu->path.dentry);
++ if (IS_ERR(inode))
++ return PTR_ERR(inode);
++
+ tu->consumer.filter = filter;
+ uprobe = uprobe_register(inode, tu->offset, tu->ref_ctr_offset, &tu->consumer);
+ if (IS_ERR(uprobe))
+ return PTR_ERR(uprobe);
+
+ tu->uprobe = uprobe;
+ return 0;
+}
+
- static int append_trace_uprobe(struct trace_uprobe *tu, struct trace_uprobe *to)
+ static int append_trace_uprobe(struct trace_uprobe *tu, struct trace_uprobe *to,
+ struct inode *inode)
{
int ret;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-17 13:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 13:01 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-10-20 10:34 Mark Brown
2026-07-08 11:25 Mark Brown
2026-07-08 11:04 Mark Brown
2026-04-15 10:43 Mark Brown
2026-04-14 11:22 Mark Brown
2026-03-13 12:59 Mark Brown
2025-10-02 11:31 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=avxQLGt-FR3f7pEW@sirena.org.uk \
--to=broonie@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mhiramat@kernel.org \
/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
all inboxes | Powered by JetHome®