Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
	init/main.c
	kernel/module.c
	scripts/bootgraph.pl

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/init.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/module.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/module.c
index 7576c2d,25bc9ac..0d8d21e
--- 1/kernel/module.c
--- 2/kernel/module.c
+++ b/kernel/module.c
@@@ -1836,9 -1860,7 +1865,10 @@@ static noinline struct module *load_mod
  #endif
        unsigned int markersindex;
        unsigned int markersstringsindex;
+       unsigned int verboseindex;
 +      unsigned int tracepointsindex;
 +      unsigned int tracepointsstringsindex;
 +      unsigned int mcountindex;
        struct module *mod;
        long err = 0;
        void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
@@@ -2126,12 -2155,7 +2164,13 @@@
        markersindex = find_sec(hdr, sechdrs, secstrings, "__markers");
        markersstringsindex = find_sec(hdr, sechdrs, secstrings,
                                        "__markers_strings");
+       verboseindex = find_sec(hdr, sechdrs, secstrings, "__verbose");
 +      tracepointsindex = find_sec(hdr, sechdrs, secstrings, "__tracepoints");
 +      tracepointsstringsindex = find_sec(hdr, sechdrs, secstrings,
 +                                      "__tracepoints_strings");
 +
 +      mcountindex = find_sec(hdr, sechdrs, secstrings,
 +                             "__mcount_loc");
  
        /* Now do relocations. */
        for (i = 1; i < hdr->e_shnum; i++) {
@@@ -2188,16 -2205,8 +2227,17 @@@
                marker_update_probe_range(mod->markers,
                        mod->markers + mod->num_markers);
  #endif
+       dynamic_printk_setup(sechdrs, verboseindex);
 +#ifdef CONFIG_TRACEPOINTS
 +              tracepoint_update_probe_range(mod->tracepoints,
 +                      mod->tracepoints + mod->num_tracepoints);
 +#endif
 +      }
 +
 +      /* sechdrs[0].sh_size is always zero */
 +      mseg = (void *)sechdrs[mcountindex].sh_addr;
 +      ftrace_init_module(mseg, mseg + sechdrs[mcountindex].sh_size);
 +
        err = module_finalize(hdr, sechdrs, mod);
        if (err < 0)
                goto cleanup;