Merge branch 'master' of gitee.com:src-openeuler/dlm into master

Signed-off-by: zouzhimin <zouzhimin@kylinos.cn>

dlm.spec

@@ -1,6 +1,6 @@
 Name:           dlm
 Version:        4.2.0
-Release:        4
+Release:        5
 License:        GPLv2 and GPLv2+ and LGPLv2+
 Group:          System Environment/Kernel
 Summary:        dlm control daemon and tool
@@ -15,7 +15,9 @@ BuildRequires:  annobin
 Source0:	https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
 Patch0001:	0030-dlm_controld-remove-unnecessary-header-include.patch
 Patch0002:      fix-various-deadcode-issues.patch
-Patch0003:      Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch
+Patch0003:      update-Linux-kernel-implementations.patch
+Patch0004:      Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch
+
 Requires:       %{name}-lib = %{version}-%{release}
 Requires:       corosync >= 3.1.0
 Requires(post): systemd-units
@@ -98,9 +100,12 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Mar 06 2024 zouzhimin <zouzhimin@kylinos.cn> - 4.2.0-4
+* Wed Mar 06 2024 zouzhimin <zouzhimin@kylinos.cn> - 4.2.0-5
 - Revert "treewide: add -fcf-protection=full to CFLAGS"
 
+* Tue Mar 05 2024 zouzhimin <zouzhimin@kylinos.cn> - 4.2.0-4
+- dlm_controld: update Linux kernel implementations
+
 * Mon Mar 04 2024 laokz <zhangkai@iscas.ac.cn> - 4.2.0-3
 - riscv64: remove -fcf-protection