summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-14 22:29:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-14 22:29:31 +0200
commitd985524680b77a1cf90738db9a2d72065a746afa (patch)
tree101857c3e59f9238b0c7d4bbbf58e46476957387 /drivers/char
parentMAINTAINERS: fpga: Update email and add patchwork URL (diff)
parentLinux 4.13-rc5 (diff)
downloadlinux-d985524680b77a1cf90738db9a2d72065a746afa.tar.xz
linux-d985524680b77a1cf90738db9a2d72065a746afa.zip
Merge 4.13-rc5 into char-misc-next
We want the firmware, and other changes, in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/random.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index afa3ce7d3e72..8ad92707e45f 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1492,7 +1492,7 @@ static void _warn_unseeded_randomness(const char *func_name, void *caller,
#ifndef CONFIG_WARN_ALL_UNSEEDED_RANDOM
print_once = true;
#endif
- pr_notice("random: %s called from %pF with crng_init=%d\n",
+ pr_notice("random: %s called from %pS with crng_init=%d\n",
func_name, caller, crng_init);
}