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>
This commit is contained in:
Greg Kroah-Hartman
2017-08-14 13:29:31 -07:00
875 changed files with 14286 additions and 18317 deletions

View File

@@ -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);
}