diff --git a/SOURCE b/SOURCE index ce16aaf32c920b8f63efbe92ff9b886447b1da80..2070d3dc5bafeccf931afd766196ba31d7e2aa7f 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -5.10.0-4.9.0 +5.10.0-4.12.0 diff --git a/kernel.spec b/kernel.spec index 1abda4d35b99d3b13f8afddf84a41286e9b0ef4f..421b8d28efefb394dca1e7c9f141c00830ea7b69 100644 --- a/kernel.spec +++ b/kernel.spec @@ -11,8 +11,8 @@ %global upstream_version 5.10 %global upstream_sublevel 0 %global devel_release 4 -%global maintenance_release .9.0 -%global pkg_release .22 +%global maintenance_release .12.0 +%global pkg_release .24 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -872,6 +872,18 @@ fi %endif %changelog +* Fri Mar 12 2021 Zheng Zengkai - 5.10.0-4.12.0.24 +- arm64: Uninstall cpu park after cpu up +- sysrq: avoid concurrently info printing by 'sysrq-trigger' +- cacheinfo: workaround cacheinfo's info_list uninitialized error + +* Fri Mar 12 2021 Zheng Zengkai - 5.10.0-4.11.0.23 +- park: Reserve park mem before kexec reserved +- pmem: Enable legacy pmem on openEuler +- arm64: Add memmap parameter and register pmem +- etmem: Modify the memig feature name to etmem +- arm: keep the original function for non-RPi + * Tue Mar 9 2021 Roberto Sassu - 5.10.0-4.9.0.22 - Add OBS PGP key diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec index 5df706120b9dcd98df32061c0750582e59ca4cb6..dce5ac2e591b15e49a6eb04e400cc7e93ef099ce 100644 --- a/raspberrypi-kernel.spec +++ b/raspberrypi-kernel.spec @@ -2,13 +2,13 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 4.9.0 +%global hulkrelease 4.12.0 %global debug_package %{nil} Name: raspberrypi-kernel Version: 5.10.0 -Release: %{hulkrelease}.2 +Release: %{hulkrelease}.4 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -172,6 +172,18 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/ /lib/modules/%{KernelVer} %changelog +* Fri Mar 12 2021 Zheng Zengkai - 5.10.0-4.12.0.4 +- arm64: Uninstall cpu park after cpu up +- sysrq: avoid concurrently info printing by 'sysrq-trigger' +- cacheinfo: workaround cacheinfo's info_list uninitialized error + +* Fri Mar 12 2021 Zheng Zengkai - 5.10.0-4.11.0.3 +- park: Reserve park mem before kexec reserved +- pmem: Enable legacy pmem on openEuler +- arm64: Add memmap parameter and register pmem +- etmem: Modify the memig feature name to etmem +- arm: keep the original function for non-RPi + * Tue Mar 9 2021 Yafen Fang - 5.10.0-4.9.0.2 - arm64: ipi_nmi: fix compile error when CONFIG_KGDB is disabled - kbuild: fix compile error in Makefile.lib