All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jessica Yu <jeyu@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: [GIT PULL] Modules updates for v5.2
Date: Tue, 14 May 2019 17:37:46 +0200	[thread overview]
Message-ID: <20190514153746.GA4533@linux-8ccs> (raw)

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://git@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 <jeyu@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	other threads:[~2019-05-14 15:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-14 15:37 Jessica Yu [this message]
2019-05-14 20:15 ` [GIT PULL] Modules updates for v5.2 pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190514153746.GA4533@linux-8ccs \
    --to=jeyu@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.