diff --git a/SOURCE b/SOURCE
index de5f3ec..01053bd 100644
--- a/SOURCE
+++ b/SOURCE
@@ -1 +1 @@
-5.10.0-5.7.0
+5.10.0-5.8.0
diff --git a/kernel.spec b/kernel.spec
index 2a268ec..e6eae25 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -11,8 +11,8 @@
 %global upstream_version    5.10
 %global upstream_sublevel   0
 %global devel_release       5
-%global maintenance_release .7.0
-%global pkg_release         .21
+%global maintenance_release .8.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 Aug 26 2021 Zheng Zengkai <zhengzengkai@huawei.com> - 5.10.0-5.8.0.22
+- mm/page_alloc: correct return value of populated elements if bulk array is populated
+- mm: fix oom killing for disabled pid
+
 * Tue Aug 24 2021 Zheng Zengkai <zhengzengkai@huawei.com> - 5.10.0-5.7.0.21
 - X86/config: Enable CONFIG_USERSWAP
 
diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec
index 5e70764..21f7fad 100644
--- a/raspberrypi-kernel.spec
+++ b/raspberrypi-kernel.spec
@@ -2,13 +2,13 @@
 
 %global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
 
-%global hulkrelease 5.7.0
+%global hulkrelease 5.8.0
 
 %global debug_package %{nil}
 
 Name:	 raspberrypi-kernel
 Version: 5.10.0
-Release: %{hulkrelease}.5
+Release: %{hulkrelease}.6
 Summary: Linux Kernel
 License: GPLv2
 URL:	 http://www.kernel.org/
@@ -174,6 +174,10 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
 /lib/modules/%{KernelVer}
 
 %changelog
+* Thu Aug 26 2021 Zheng Zengkai <zhengzengkai@huawei.com> - 5.10.0-5.8.0.6
+- mm/page_alloc: correct return value of populated elements if bulk array is populated
+- mm: fix oom killing for disabled pid
+
 * Tue Aug 24 2021 Zheng Zengkai <zhengzengkai@huawei.com> - 5.10.0-5.7.0.5
 - X86/config: Enable CONFIG_USERSWAP