From 5f84a6249a914d081794aaf9b900f64ad8980a7d Mon Sep 17 00:00:00 2001 From: zhengzengkai Date: Thu, 11 Mar 2021 23:25:58 +0800 Subject: [PATCH 1/6] update SOURCE. release 5.10.0-4.10.0.22 --- SOURCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SOURCE b/SOURCE index ce16aaf3..60101c1c 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -5.10.0-4.9.0 +5.10.0-4.10.0 -- Gitee From b646d96cf6548369ded2b57462895d6d8a00e993 Mon Sep 17 00:00:00 2001 From: zhengzengkai Date: Thu, 11 Mar 2021 23:29:12 +0800 Subject: [PATCH 2/6] update kernel.spec. release 5.10.0-4.10.0.22 --- kernel.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 2f6cd2de..ec8da186 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 .21 +%global maintenance_release .10.0 +%global pkg_release .22 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -869,6 +869,10 @@ fi %endif %changelog +* Thu Mar 11 2021 Zheng Zengkai - 5.10.0-4.10.0.22 +- etmem: Modify the memig feature name to etmem +- arm: keep the original function for non-RPi + * Mon Mar 8 2021 Zheng Zengkai - 5.10.0-4.9.0.21 - arm64: ipi_nmi: fix compile error when CONFIG_KGDB is disabled - kbuild: fix compile error in Makefile.lib -- Gitee From 0e0ad90fc3af3403c7e7b486b774f2ac3a7d2d98 Mon Sep 17 00:00:00 2001 From: zhengzengkai Date: Fri, 12 Mar 2021 11:49:08 +0800 Subject: [PATCH 3/6] update kernel.spec. release 5.10.0-4.10.0.23-fix ci build error --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index d3c174cd..1653be4a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global upstream_sublevel 0 %global devel_release 4 %global maintenance_release .10.0 -%global pkg_release .22 +%global pkg_release .23 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh -- Gitee From cf37851212814af7f867e315aa75dd4d43bb04ea Mon Sep 17 00:00:00 2001 From: zhengzengkai Date: Fri, 12 Mar 2021 11:54:56 +0800 Subject: [PATCH 4/6] update kernel.spec. release 5.10.0-4.10.0.23-fix ci build error, amend changelog --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 1653be4a..94bfefe4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -872,7 +872,7 @@ fi %endif %changelog -* Fri Mar 12 2021 Zheng Zengkai - 5.10.0-4.10.0.22 +* Fri Mar 12 2021 Zheng Zengkai - 5.10.0-4.10.0.23 - park: Reserve park mem before kexec reserved - pmem: Enable legacy pmem on openEuler - arm64: Add memmap parameter and register pmem -- Gitee From c2430e6f316f8bdd7dfa901da7a2c2ff1022119b Mon Sep 17 00:00:00 2001 From: zhengzengkai Date: Fri, 12 Mar 2021 15:31:35 +0800 Subject: [PATCH 5/6] update SOURCE. release 5.10.0-4.11.0 for all(RPi & non-RPi) --- SOURCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SOURCE b/SOURCE index 60101c1c..d545e3ae 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -5.10.0-4.10.0 +5.10.0-4.11.0 -- Gitee From c0e250d24e58be9e582c2efc0163664cc19a2711 Mon Sep 17 00:00:00 2001 From: zhengzengkai Date: Fri, 12 Mar 2021 15:37:54 +0800 Subject: [PATCH 6/6] update kernel.spec. release 5.10.0-4.11.0 for all (RPi & non-RPi) --- kernel.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 94bfefe4..c8c0fbac 100644 --- a/kernel.spec +++ b/kernel.spec @@ -11,7 +11,7 @@ %global upstream_version 5.10 %global upstream_sublevel 0 %global devel_release 4 -%global maintenance_release .10.0 +%global maintenance_release .11.0 %global pkg_release .23 %define with_debuginfo 1 @@ -872,7 +872,7 @@ fi %endif %changelog -* Fri Mar 12 2021 Zheng Zengkai - 5.10.0-4.10.0.23 +* 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 -- Gitee