Linus,

Please pull below to receive modules updates for the 5.2 merge window.
Details can be found in the signed tag.

Note that there is a trivial conflict between the modules tree and vfs tree
in include/linux/module.h.
Commit 007ec26cdc9f ("vfs: Implement logging through fs_context") from the
vfs tree and commit dadec066d8fa ("module: add stubs for within_module
functions") from the modules tree both added the stub for
within_module_core(). The hunk in question is exactly the same for both
commits, so the conflict is trivially resolvable.

Thanks,

Jessica

---
The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:

 Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)

are available in the Git repository at:

 ssh://g...@gitolite.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git 
tags/modules-for-v5.2

for you to fetch changes up to dadec066d8fa7da227f623f632ea114690fecaf8:

 module: add stubs for within_module functions (2019-05-02 16:32:29 +0200)

----------------------------------------------------------------
Modules updates for v5.2

Summary of modules changes for the 5.2 merge window:

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

- Trivial code cleanups

Signed-off-by: Jessica Yu <j...@kernel.org>

----------------------------------------------------------------
Eugene Loh (1):
     kallsyms: store type information in its own array

Mathias Krause (1):
     vmlinux.lds.h: drop unused __vermagic

Tri Vo (1):
     module: add stubs for within_module functions

include/asm-generic/vmlinux.lds.h |  1 -
include/linux/module.h            | 18 ++++++++++++++++++
kernel/module-internal.h          |  2 +-
kernel/module.c                   | 21 ++++++++++++++-------
4 files changed, 33 insertions(+), 9 deletions(-)

Reply via email to