[GIT,PULL] RISC-V Patches for the 5.10 Merge Window, Part 2
mbox series

Message ID mhng-ed53d520-0ecd-4767-ade1-f4266118c3c0@palmerdabbelt-glaptop1
State Accepted
Commit 0593c1b4598a77b5f835b278cde0ab71e2578588
Headers show
Series
  • [GIT,PULL] RISC-V Patches for the 5.10 Merge Window, Part 2
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-5.10-mw1

Message

Palmer Dabbelt Oct. 24, 2020, 5:13 a.m. UTC
The following changes since commit de22d2107ced3cc5355cc9dbbd85e44183546bd5:

  RISC-V: Add page table dump support for uefi (2020-10-02 14:31:33 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-5.10-mw1

for you to fetch changes up to e8d444d3e98c255f91d228984abc46cfdfaf48b4:

  riscv: remove address space overrides using set_fs() (2020-10-04 10:27:10 -0700)

----------------------------------------------------------------
RISC-V Patches for the 5.10 Merge Window, Part 2

This actually just contains a single patch set:

* The remainder of Christoph's work to remove set_fs, including the RISC-V
  portion.

----------------------------------------------------------------
I know I said in the previous PR that I'd keep including shortlogs as of the
last tag, but I haven't done that here as it would include my previous PR.
Essentially I wanted to wait for the base branch of this to land first, as it
touched a lot.  Rather than rebasing I've just left the original merge in
place and sent a shortlog against master.

I'm not sure why the diffstat shows so much more, though.  I manually checked
the commits and my merge has the same commits yours does.  It's my first time
trying this particular sort of merge (though the last one had a tag-based merge
of the same sort, which IIUC shouldn't be any different) so hopefully it went
OK.

Christoph Hellwig (8):
      uaccess: provide a generic TASK_SIZE_MAX definition
      asm-generic: improve the nommu {get,put}_user handling
      asm-generic: add nommu implementations of __{get,put}_kernel_nofault
      asm-generic: make the set_fs implementation optional
      riscv: use memcpy based uaccess for nommu again
      riscv: refactor __get_user and __put_user
      riscv: implement __get_kernel_nofault and __put_user_nofault
      riscv: remove address space overrides using set_fs()

Palmer Dabbelt (1):
      Merge branch 'base.set_fs' of git://git.kernel.org/.../viro/vfs into for-next

 arch/Kconfig                            |   3 +
 arch/alpha/Kconfig                      |   1 +
 arch/arc/Kconfig                        |   1 +
 arch/arm/Kconfig                        |   1 +
 arch/arm64/Kconfig                      |   1 +
 arch/c6x/Kconfig                        |   1 +
 arch/csky/Kconfig                       |   1 +
 arch/h8300/Kconfig                      |   1 +
 arch/hexagon/Kconfig                    |   1 +
 arch/ia64/Kconfig                       |   1 +
 arch/m68k/Kconfig                       |   1 +
 arch/microblaze/Kconfig                 |   1 +
 arch/mips/Kconfig                       |   1 +
 arch/nds32/Kconfig                      |   1 +
 arch/nios2/Kconfig                      |   1 +
 arch/openrisc/Kconfig                   |   1 +
 arch/parisc/Kconfig                     |   1 +
 arch/powerpc/include/asm/processor.h    |   7 --
 arch/powerpc/include/asm/thread_info.h  |   5 +-
 arch/powerpc/include/asm/uaccess.h      |  67 ++++--------
 arch/powerpc/kernel/signal.c            |   3 -
 arch/powerpc/lib/sstep.c                |   6 +-
 arch/riscv/Kconfig                      |   1 +
 arch/riscv/include/asm/thread_info.h    |   6 --
 arch/riscv/include/asm/uaccess.h        | 177 ++++++++++++++++----------------
 arch/riscv/kernel/process.c             |   1 -
 arch/riscv/lib/Makefile                 |   2 +-
 arch/s390/Kconfig                       |   1 +
 arch/sh/Kconfig                         |   1 +
 arch/sparc/Kconfig                      |   1 +
 arch/um/Kconfig                         |   1 +
 arch/x86/ia32/ia32_aout.c               |   1 -
 arch/x86/include/asm/page_32_types.h    |  11 ++
 arch/x86/include/asm/page_64_types.h    |  38 +++++++
 arch/x86/include/asm/processor.h        |  60 +----------
 arch/x86/include/asm/thread_info.h      |   2 -
 arch/x86/include/asm/uaccess.h          |  26 +----
 arch/x86/kernel/asm-offsets.c           |   3 -
 arch/x86/lib/getuser.S                  |  47 ++++-----
 arch/x86/lib/putuser.S                  |  25 ++---
 arch/xtensa/Kconfig                     |   1 +
 drivers/misc/lkdtm/bugs.c               |  10 --
 drivers/misc/lkdtm/core.c               |   2 -
 drivers/misc/lkdtm/lkdtm.h              |   2 -
 drivers/misc/lkdtm/usercopy.c           |  15 ---
 fs/proc/inode.c                         | 119 ++++++++++++++-------
 fs/proc/proc_sysctl.c                   |  48 ++++-----
 fs/read_write.c                         |  69 ++++++++-----
 fs/splice.c                             | 130 +++--------------------
 include/asm-generic/uaccess.h           | 109 ++++++++++++--------
 include/linux/bpf-cgroup.h              |   2 +-
 include/linux/fs.h                      |   2 -
 include/linux/proc_fs.h                 |   1 +
 include/linux/uaccess.h                 |  22 ++++
 kernel/bpf/cgroup.c                     |   2 +-
 lib/test_bitmap.c                       |  91 ++++------------
 tools/testing/selftests/lkdtm/tests.txt |   2 -
 57 files changed, 509 insertions(+), 629 deletions(-)

Comments

pr-tracker-bot@kernel.org Oct. 24, 2020, 6:11 p.m. UTC | #1
The pull request you sent on Fri, 23 Oct 2020 22:13:02 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-5.10-mw1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0593c1b4598a77b5f835b278cde0ab71e2578588

Thank you!