Hi all,

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

  kernel/kprobes.c

between commit:

  4fdd88877e52 ("kprobes: Lock kprobe_mutex while showing kprobe_blacklist")

from the tip tree and commit:

  71294f4f8167 ("kernel/kprobes.c: convert to use DEFINE_SEQ_ATTRIBUTE macro")

from the akpm-current 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 kernel/kprobes.c
index 9622ee05f5fa,9146e1a8373b..000000000000
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@@ -2506,15 -2436,10 +2496,15 @@@ static int kprobe_blacklist_seq_show(st
  	return 0;
  }
  
 +static void kprobe_blacklist_seq_stop(struct seq_file *f, void *v)
 +{
 +	mutex_unlock(&kprobe_mutex);
 +}
 +
- static const struct seq_operations kprobe_blacklist_seq_ops = {
+ static const struct seq_operations kprobe_blacklist_sops = {
  	.start = kprobe_blacklist_seq_start,
  	.next  = kprobe_blacklist_seq_next,
 -	.stop  = kprobe_seq_stop,	/* Reuse void function */
 +	.stop  = kprobe_blacklist_seq_stop,
  	.show  = kprobe_blacklist_seq_show,
  };