commit 78d5dcda92a17f17132671c269ea2c3a17688649
author Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 14 16:04:26 2015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 14 16:04:26 2015 -0700
tree 8b3fa4f89eb2c488b080663d88d10de413239f39
parent 2cfde72f0f26d3df7e565c5dce687c372042feba
parent 7d2ac45611b072a24e5014a56a65e6be31c1f884

Merge tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy

Pull jfs update from David Kleikamp:
 "Not much this time. Just a one-liner format fix"

* tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy:
  jfs: %pf is only for function pointers

fs/jfs/super.c

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 5d30c56..4cd9798f 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -102,7 +102,7 @@
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	pr_err("ERROR: (device %s): %pf: %pV\n",
+	pr_err("ERROR: (device %s): %ps: %pV\n",
 	       sb->s_id, __builtin_return_address(0), &vaf);
 
 	va_end(args);