Subject: linux-next: manual merge of the ftrace tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 15 Aug 2018 14:04:16 +1000

Hi Steven,

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

  kernel/events/uprobes.c

between commit:

  788faab70d5a ("perf, tools: Use correct articles in comments")

from Linus' tree and commit:

  38e967ae1e60 ("Uprobes: Simplify uprobe_register() body")

from the ftrace tree.

I fixed it up (the latter moved the uprobe_unregister function - 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 kernel/events/uprobes.c
index aed1ba569954,c0418ba52ba8..000000000000
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@@ -860,7 -856,28 +856,28 @@@ __uprobe_unregister(struct uprobe *upro
  }
  
  /*
-  * uprobe_register - register a probe
 - * uprobe_unregister - unregister a already registered probe.
++ * uprobe_unregister - unregister an already registered probe.
+  * @inode: the file in which the probe has to be removed.
+  * @offset: offset from the start of the file.
+  * @uc: identify which probe if multiple probes are colocated.
+  */
+ void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
+ {
+ 	struct uprobe *uprobe;
+ 
+ 	uprobe = find_uprobe(inode, offset);
+ 	if (WARN_ON(!uprobe))
+ 		return;
+ 
+ 	down_write(&uprobe->register_rwsem);
+ 	__uprobe_unregister(uprobe, uc);
+ 	up_write(&uprobe->register_rwsem);
+ 	put_uprobe(uprobe);
+ }
+ EXPORT_SYMBOL_GPL(uprobe_unregister);
+ 
+ /*
+  * __uprobe_register - register a probe
   * @inode: the file in which the probe has to be placed.
   * @offset: offset from the start of the file.
   * @uc: information on howto handle the probe..