Merge tag 'modules-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 May 2019 17:55:54 +0000 (10:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 May 2019 17:55:54 +0000 (10:55 -0700)
Pull modules updates from Jessica Yu:

 - Use a separate table to store symbol types instead of hijacking
   fields in struct Elf_Sym

 - Trivial code cleanups

* tag 'modules-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: add stubs for within_module functions
  kallsyms: store type information in its own array
  vmlinux.lds.h: drop unused __vermagic

1  2 
include/asm-generic/vmlinux.lds.h
include/linux/module.h
kernel/module.c

Simple merge
Simple merge
diff --cc kernel/module.c
Simple merge