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;