From 1cdafccf8548233019073ba13b04f595034ffe9f Mon Sep 17 00:00:00 2001 From: Zheng Zengkai Date: Mon, 21 Mar 2022 12:13:46 +0800 Subject: [PATCH 1/2] Fix split errors in check-kabi and remove redundant warning for check-kabi Signed-off-by: Zheng Zengkai --- check-kabi | 6 +++--- kernel.spec | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/check-kabi b/check-kabi index eb38c4c8..db6c7e15 100644 --- a/check-kabi +++ b/check-kabi @@ -56,7 +56,7 @@ def load_kabi(kabi,filename): break if in_line == "\n": continue - checksum,symbol,directory,type = in_line.split() + checksum,symbol,directory,type,namespace = in_line.split('\t') kabi[symbol] = in_line[0:-1] @@ -71,9 +71,9 @@ def check_kabi(symvers,kabi): losted_symbols=[] for symbol in kabi: - abi_hash,abi_sym,abi_dir,abi_type = kabi[symbol].split() + abi_hash,abi_sym,abi_dir,abi_type,abi_namespace = kabi[symbol].split('\t') if symbol in symvers: - sym_hash,sym_sym,sym_dir,sym_type = symvers[symbol].split() + sym_hash,sym_sym,sym_dir,sym_type,sym_namespace = symvers[symbol].split('\t') if abi_hash != sym_hash: fail=1 changed_symbols.append(symbol) diff --git a/kernel.spec b/kernel.spec index 7aafbe01..e4b761d6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -340,7 +340,6 @@ make ARCH=%{Arch} modules %{?_smp_mflags} chmod 0755 %{SOURCE18} if [ -e $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu} ]; then %{SOURCE18} -k $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu} -s Module.symvers || exit 1 - echo "**** NOTE: now don't check Kabi. ****" else echo "**** NOTE: Cannot find reference Module.kabi file. ****" fi -- Gitee From cf58087e916cb009f139444d1c4f28cc45131b6c Mon Sep 17 00:00:00 2001 From: Zheng Zengkai Date: Mon, 21 Mar 2022 12:22:08 +0800 Subject: [PATCH 2/2] release 5.10.0-60.14.0 --- SOURCE | 2 +- kernel.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SOURCE b/SOURCE index c31d10fa..a816e1d2 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -5.10.0-60.13.0 +5.10.0-60.14.0 diff --git a/kernel.spec b/kernel.spec index e4b761d6..fd0c5ad1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -11,8 +11,8 @@ %global upstream_version 5.10 %global upstream_sublevel 0 %global devel_release 60 -%global maintenance_release .13.0 -%global pkg_release .45 +%global maintenance_release .14.0 +%global pkg_release .46 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -883,6 +883,12 @@ fi %endif %changelog +* Mon Mar 21 2022 Zheng Zengkai - 5.10.0-60.14.0.46 +- vfs: fs_context: fix up param length parsing in legacy_parse_param +- NFS: LOOKUP_DIRECTORY is also ok with symlinks +- blk-mq: fix potential uaf for 'queue_hw_ctx' +- blk-mq: add exception handling when srcu->sda alloc failed + * Sun Mar 20 2022 Zheng Zengkai - 5.10.0-60.13.0.45 - mm/dynamic_hugetlb: initialize subpages before merging - mm/dynamic_hugetlb: set/clear HPageFreed -- Gitee