mbox series

[GIT,PULL] RISC-V updates for v5.5-rc3

Message ID alpine.DEB.2.21.9999.1912211854440.57866@viisi.sifive.com (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL] RISC-V updates for v5.5-rc3 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv/for-v5.5-rc3

Message

Paul Walmsley Dec. 22, 2019, 2:57 a.m. UTC
Linus,

The following changes since commit 7e0165b2f1a912a06e381e91f0f4e495f4ac3736:

  Merge branch 'akpm' (patches from Andrew) (2019-12-19 08:13:04 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv/for-v5.5-rc3

for you to fetch changes up to 9209fb51896fe0eef8dfac85afe1f357e9265c0d:

  riscv: move sifive_l2_cache.c to drivers/soc (2019-12-20 03:40:24 -0800)

----------------------------------------------------------------
RISC-V updates for v5.5-rc3

Several fixes, and one cleanup, for RISC-V.

Fixes:

- Fix an error in a Kconfig file that resulted in an undefined Kconfig
  option "CONFIG_CONFIG_MMU"

- Fix undefined Kconfig option "CONFIG_CONFIG_MMU"

- Fix scratch register clearing in M-mode (affects nommu users)

- Fix a mismerge on my part that broke the build for
  CONFIG_SPARSEMEM_VMEMMAP users

Cleanups:

- Move SiFive L2 cache-related code to drivers/soc, per request

----------------------------------------------------------------
Andreas Schwab (1):
      riscv: Fix use of undefined config option CONFIG_CONFIG_MMU

Christoph Hellwig (1):
      riscv: move sifive_l2_cache.c to drivers/soc

David Abdurachmanov (1):
      riscv: define vmemmap before pfn_to_page calls

Greentime Hu (1):
      riscv: fix scratch register clearing in M-mode.

 MAINTAINERS                                        |  1 +
 arch/riscv/Kconfig                                 |  2 +-
 arch/riscv/include/asm/pgtable.h                   | 38 ++++++++++++----------
 arch/riscv/kernel/head.S                           |  2 +-
 arch/riscv/mm/Makefile                             |  1 -
 drivers/edac/Kconfig                               |  2 +-
 drivers/soc/Kconfig                                |  1 +
 drivers/soc/Makefile                               |  1 +
 drivers/soc/sifive/Kconfig                         | 10 ++++++
 drivers/soc/sifive/Makefile                        |  3 ++
 .../mm => drivers/soc/sifive}/sifive_l2_cache.c    |  0
 11 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 drivers/soc/sifive/Kconfig
 create mode 100644 drivers/soc/sifive/Makefile
 rename {arch/riscv/mm => drivers/soc/sifive}/sifive_l2_cache.c (100%)

Kernel object size difference:
   text	   data	    bss	    dec	    hex	filename
6895393	2330852	 313920	9540165	 919245	vmlinux.rv64.orig
6894347	2329588	 313920	9537855	 91893f	vmlinux.rv64.patched
6656178	1939832	 257640	8853650	 871892	vmlinux.rv32.orig
6655130	1938688	 257576	8851394	 870fc2	vmlinux.rv32.patched
1172240	 354256	 130024	1656520	 1946c8	vmlinux.nommu_virt.orig
1171538	 353368	 130024	1654930	 194092	vmlinux.nommu_virt.patched

Comments

pr-tracker-bot@kernel.org Dec. 22, 2019, 7:10 p.m. UTC | #1
The pull request you sent on Sat, 21 Dec 2019 18:57:50 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv/for-v5.5-rc3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7214618c60e947b8cea12b47d8279bd4220f21bc

Thank you!