Also remove Patch0001 since it has been merged in openeuler/kernel
Signed-off-by: Wei Li <liwei391(a)huawei.com>
---
...script-to-update-openeuler_defconfig.patch | 85 -------------------
SOURCE | 2 +-
kernel.spec | 12 +--
3 files changed, 8 insertions(+), 91 deletions(-)
delete mode 100644 0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
diff --git a/0001-kconfig-Add-script-to-update-openeuler_defconfig.patch b/0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
deleted file mode 100644
index c16b85a..0000000
--- a/0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 5b6166bdb21db9d73a273138d9da74e20c63c560 Mon Sep 17 00:00:00 2001
-From: Liu Chao <liuchao173(a)huawei.com>
-Date: Wed, 4 Jan 2023 20:49:34 +0800
-Subject: [PATCH 1/3] kconfig: Add script to update openeuler_defconfig
-
-hulk inclusion
-bugzilla: https://gitee.com/openeuler/kernel/issues/I68D0O
-
-Reference: https://gitee.com/openeuler/kernel/pulls/286
-Reference: https://gitee.com/openeuler/kernel/commit/ca1af5899ef7c1e1617913ecee37d5397…
-
-update_oedefconfig:run make openeuler_defconfig and copy .config to arch/$(SRCARCH)/configs/openeuler_defconfig
-save_oedefconfig:copy .config to arch/$(SRCARCH)/configs/openeuler_defconfig
-
-Signed-off-by: Liu Chao <liuchao173(a)huawei.com>
-[XQ: 1. update helper message
- 2. remove more auto generated CONFIG.]
-Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com>
----
- scripts/kconfig/Makefile | 10 ++++++++++
- scripts/kconfig/makeconfig.sh | 24 ++++++++++++++++++++++++
- 2 files changed, 34 insertions(+)
- create mode 100644 scripts/kconfig/makeconfig.sh
-
-diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index b8ef0fb4bbef..9d0297ebf9c1 100644
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -81,6 +81,14 @@ PHONY += savedefconfig defconfig
- savedefconfig: $(obj)/conf
- $(Q)$< $(silent) --$@=defconfig $(Kconfig)
-
-+update_oedefconfig: $(obj)/conf
-+ $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/openeuler_defconfig $(Kconfig)
-+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/makeconfig.sh $(SRCARCH)
-+
-+save_oedefconfig: $(obj)/conf
-+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/makeconfig.sh $(SRCARCH)
-+
-+
- defconfig: $(obj)/conf
- ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-@@ -141,6 +149,8 @@ help:
- @echo ' default value without prompting'
- @echo ' tinyconfig - Configure the tiniest possible kernel'
- @echo ' testconfig - Run Kconfig unit tests (requires python3 and pytest)'
-+ @echo ' update_oedefconfig - Update arch/<ARCH>/configs/openeuler_defconfig base on current source code'
-+ @echo ' save_oedefconfig - Save current .config to arch/<ARCH>/configs/openeuler_defconfig'
-
- # ===========================================================================
- # object files used by all kconfig flavours
-diff --git a/scripts/kconfig/makeconfig.sh b/scripts/kconfig/makeconfig.sh
-new file mode 100644
-index 000000000000..c54f4d84ae9b
---- /dev/null
-+++ b/scripts/kconfig/makeconfig.sh
-@@ -0,0 +1,24 @@
-+#!/bin/sh
-+# SPDX-License-Identifier: GPL-2.0
-+
-+if [ ! -f .config ]; then
-+ echo ".config does not exist"
-+ exit 1
-+fi
-+
-+sed -e '/CONFIG_CC_VERSION_TEXT/d' \
-+ -e '/CONFIG_CC_IS_GCC/d' \
-+ -e '/CONFIG_GCC_VERSION/d' \
-+ -e '/CONFIG_LD_VERSION/d' \
-+ -e '/CONFIG_LD_IS/d' \
-+ -e '/CONFIG_CLANG_VERSION/d' \
-+ -e '/CONFIG_LLD_VERSION/d' \
-+ -e '/CONFIG_CC_CAN/d' \
-+ -e '/CONFIG_CC_HAS/d' \
-+ -e '/CONFIG_AS_VERSION/d' \
-+ -e '/CONFIG_AS_HAS/d' \
-+ -e '/CONFIG_AS_IS/d' \
-+ -e '/CONFIG_PAHOLE_VERSION/d' \
-+ -i .config
-+
-+cp .config arch/$1/configs/openeuler_defconfig
---
-2.25.1
-
diff --git a/SOURCE b/SOURCE
index 3bed5ba..62ac79f 100644
--- a/SOURCE
+++ b/SOURCE
@@ -1 +1 @@
-6.4.0-1.0.2
+6.4.0-2.0.0
diff --git a/kernel.spec b/kernel.spec
index b172e2a..d0eb5eb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -23,9 +23,9 @@
%global upstream_version 6.4
%global upstream_sublevel 0
-%global devel_release 1
-%global maintenance_release .0.2
-%global pkg_release .9
+%global devel_release 2
+%global maintenance_release .0.0
+%global pkg_release .10
%define with_debuginfo 1
# Do not recompute the build-id of vmlinux in find-debuginfo.sh
@@ -84,7 +84,6 @@ Source9002: series.conf
Source9998: patches.tar.bz2
%endif
-Patch0001: 0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
Patch0002: 0002-cpupower-clang-compile-support.patch
Patch0003: 0003-x86_energy_perf_policy-clang-compile-support.patch
Patch0004: 0004-turbostat-clang-compile-support.patch
@@ -316,7 +315,6 @@ Applypatches()
Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer}
%endif
-%patch0001 -p1
%if "%toolchain" == "clang"
%patch0002 -p1
%patch0003 -p1
@@ -927,6 +925,10 @@ fi
%endif
%changelog
+* Tue Aug 29 2023 Wei Li <liwei391(a)huawei.com> - 6.4.0-2.0.0.10
+- remove Patch0001
+- update to 6.4.0-2.0.0.10
+
* Fri Aug 25 2023 liyunfei <liyunfei33(a)huawei.com> - 6.4.0-1.0.2.9
- add clang LTO compile support
--
2.25.1
2
1
Also remove Patch0001 since it has been merged in openeuler/kernel
Signed-off-by: Wei Li <liwei391(a)huawei.com>
---
...script-to-update-openeuler_defconfig.patch | 85 -------------------
SOURCE | 2 +-
kernel.spec | 12 +--
3 files changed, 8 insertions(+), 91 deletions(-)
delete mode 100644 0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
diff --git a/0001-kconfig-Add-script-to-update-openeuler_defconfig.patch b/0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
deleted file mode 100644
index c16b85a..0000000
--- a/0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 5b6166bdb21db9d73a273138d9da74e20c63c560 Mon Sep 17 00:00:00 2001
-From: Liu Chao <liuchao173(a)huawei.com>
-Date: Wed, 4 Jan 2023 20:49:34 +0800
-Subject: [PATCH 1/3] kconfig: Add script to update openeuler_defconfig
-
-hulk inclusion
-bugzilla: https://gitee.com/openeuler/kernel/issues/I68D0O
-
-Reference: https://gitee.com/openeuler/kernel/pulls/286
-Reference: https://gitee.com/openeuler/kernel/commit/ca1af5899ef7c1e1617913ecee37d5397…
-
-update_oedefconfig:run make openeuler_defconfig and copy .config to arch/$(SRCARCH)/configs/openeuler_defconfig
-save_oedefconfig:copy .config to arch/$(SRCARCH)/configs/openeuler_defconfig
-
-Signed-off-by: Liu Chao <liuchao173(a)huawei.com>
-[XQ: 1. update helper message
- 2. remove more auto generated CONFIG.]
-Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com>
----
- scripts/kconfig/Makefile | 10 ++++++++++
- scripts/kconfig/makeconfig.sh | 24 ++++++++++++++++++++++++
- 2 files changed, 34 insertions(+)
- create mode 100644 scripts/kconfig/makeconfig.sh
-
-diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index b8ef0fb4bbef..9d0297ebf9c1 100644
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -81,6 +81,14 @@ PHONY += savedefconfig defconfig
- savedefconfig: $(obj)/conf
- $(Q)$< $(silent) --$@=defconfig $(Kconfig)
-
-+update_oedefconfig: $(obj)/conf
-+ $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/openeuler_defconfig $(Kconfig)
-+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/makeconfig.sh $(SRCARCH)
-+
-+save_oedefconfig: $(obj)/conf
-+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/makeconfig.sh $(SRCARCH)
-+
-+
- defconfig: $(obj)/conf
- ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-@@ -141,6 +149,8 @@ help:
- @echo ' default value without prompting'
- @echo ' tinyconfig - Configure the tiniest possible kernel'
- @echo ' testconfig - Run Kconfig unit tests (requires python3 and pytest)'
-+ @echo ' update_oedefconfig - Update arch/<ARCH>/configs/openeuler_defconfig base on current source code'
-+ @echo ' save_oedefconfig - Save current .config to arch/<ARCH>/configs/openeuler_defconfig'
-
- # ===========================================================================
- # object files used by all kconfig flavours
-diff --git a/scripts/kconfig/makeconfig.sh b/scripts/kconfig/makeconfig.sh
-new file mode 100644
-index 000000000000..c54f4d84ae9b
---- /dev/null
-+++ b/scripts/kconfig/makeconfig.sh
-@@ -0,0 +1,24 @@
-+#!/bin/sh
-+# SPDX-License-Identifier: GPL-2.0
-+
-+if [ ! -f .config ]; then
-+ echo ".config does not exist"
-+ exit 1
-+fi
-+
-+sed -e '/CONFIG_CC_VERSION_TEXT/d' \
-+ -e '/CONFIG_CC_IS_GCC/d' \
-+ -e '/CONFIG_GCC_VERSION/d' \
-+ -e '/CONFIG_LD_VERSION/d' \
-+ -e '/CONFIG_LD_IS/d' \
-+ -e '/CONFIG_CLANG_VERSION/d' \
-+ -e '/CONFIG_LLD_VERSION/d' \
-+ -e '/CONFIG_CC_CAN/d' \
-+ -e '/CONFIG_CC_HAS/d' \
-+ -e '/CONFIG_AS_VERSION/d' \
-+ -e '/CONFIG_AS_HAS/d' \
-+ -e '/CONFIG_AS_IS/d' \
-+ -e '/CONFIG_PAHOLE_VERSION/d' \
-+ -i .config
-+
-+cp .config arch/$1/configs/openeuler_defconfig
---
-2.25.1
-
diff --git a/SOURCE b/SOURCE
index 3bed5ba..62ac79f 100644
--- a/SOURCE
+++ b/SOURCE
@@ -1 +1 @@
-6.4.0-1.0.2
+6.4.0-2.0.0
diff --git a/kernel.spec b/kernel.spec
index b172e2a..d0eb5eb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -23,9 +23,9 @@
%global upstream_version 6.4
%global upstream_sublevel 0
-%global devel_release 1
-%global maintenance_release .0.2
-%global pkg_release .9
+%global devel_release 2
+%global maintenance_release .0.0
+%global pkg_release .10
%define with_debuginfo 1
# Do not recompute the build-id of vmlinux in find-debuginfo.sh
@@ -84,7 +84,6 @@ Source9002: series.conf
Source9998: patches.tar.bz2
%endif
-Patch0001: 0001-kconfig-Add-script-to-update-openeuler_defconfig.patch
Patch0002: 0002-cpupower-clang-compile-support.patch
Patch0003: 0003-x86_energy_perf_policy-clang-compile-support.patch
Patch0004: 0004-turbostat-clang-compile-support.patch
@@ -316,7 +315,6 @@ Applypatches()
Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer}
%endif
-%patch0001 -p1
%if "%toolchain" == "clang"
%patch0002 -p1
%patch0003 -p1
@@ -927,6 +925,10 @@ fi
%endif
%changelog
+* Tue Aug 29 2023 Wei Li <liwei391(a)huawei.com> - 6.4.0-2.0.0.10
+- remove Patch0001
+- update to 6.4.0-2.0.0.10
+
* Fri Aug 25 2023 liyunfei <liyunfei33(a)huawei.com> - 6.4.0-1.0.2.9
- add clang LTO compile support
--
2.25.1
2
1
hulk inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/dwarves/issues/I7KOQ6
Signed-off-by: Wei Li <liwei391(a)huawei.com>
---
SOURCE | 2 +-
kernel.spec | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/SOURCE b/SOURCE
index 5c2a9cf..3bed5ba 100644
--- a/SOURCE
+++ b/SOURCE
@@ -1 +1 @@
-6.4.0-1.0.1
+6.4.0-1.0.2
diff --git a/kernel.spec b/kernel.spec
index e31f42a..634131e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -11,8 +11,8 @@
%global upstream_version 6.4
%global upstream_sublevel 0
%global devel_release 1
-%global maintenance_release .0.1
-%global pkg_release .5
+%global maintenance_release .0.2
+%global pkg_release .6
%define with_debuginfo 1
# Do not recompute the build-id of vmlinux in find-debuginfo.sh
@@ -226,7 +226,8 @@ package or when debugging this package.\
%{nil}
%debuginfo_template -n kernel
-%files -n kernel-debuginfo -f debugfiles.list
+%files -n kernel-debuginfo -f kernel-debugfiles.list -f debugfiles.list
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} --keep-section '.BTF' -p '.*/%{KernelVer}/.*|.*/vmlinux|XXX' -o kernel-debugfiles.list}
%debuginfo_template -n bpftool
%files -n bpftool-debuginfo -f bpftool-debugfiles.list
@@ -873,6 +874,9 @@ fi
%endif
%changelog
+* Wed Aug 23 2023 Wei Li <liwei391(a)huawei.com> - 6.4.0-1.0.2.6
+- keep .BTF section in modules
+
* Wed Aug 9 2023 Mingzheng Xing <xingmingzheng(a)iscas.ac.cn> - 6.4.0-1.0.1.5
- add riscv64 support
--
2.25.1
2
1
hulk inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/dwarves/issues/I7KOQ6
Signed-off-by: Wei Li <liwei391(a)huawei.com>
---
SOURCE | 2 +-
kernel.spec | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/SOURCE b/SOURCE
index 5c2a9cf..3bed5ba 100644
--- a/SOURCE
+++ b/SOURCE
@@ -1 +1 @@
-6.4.0-1.0.1
+6.4.0-1.0.2
diff --git a/kernel.spec b/kernel.spec
index e31f42a..634131e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -11,8 +11,8 @@
%global upstream_version 6.4
%global upstream_sublevel 0
%global devel_release 1
-%global maintenance_release .0.1
-%global pkg_release .5
+%global maintenance_release .0.2
+%global pkg_release .6
%define with_debuginfo 1
# Do not recompute the build-id of vmlinux in find-debuginfo.sh
@@ -226,7 +226,8 @@ package or when debugging this package.\
%{nil}
%debuginfo_template -n kernel
-%files -n kernel-debuginfo -f debugfiles.list
+%files -n kernel-debuginfo -f kernel-debugfiles.list -f debugfiles.list
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} --keep-section '.BTF' -p '.*/%{KernelVer}/.*|.*/vmlinux|XXX' -o kernel-debugfiles.list}
%debuginfo_template -n bpftool
%files -n bpftool-debuginfo -f bpftool-debugfiles.list
@@ -873,6 +874,9 @@ fi
%endif
%changelog
+* Wed Aug 23 2023 Wei Li <liwei391(a)huawei.com> - 6.4.0-1.0.2.6
+- keep .BTF section in modules
+
* Wed Aug 9 2023 Mingzheng Xing <xingmingzheng(a)iscas.ac.cn> - 6.4.0-1.0.1.5
- add riscv64 support
--
2.25.1
2
1
Merge committer info from follow files:
https://gitee.com/openeuler/kernel/blob/OLK-5.10/openEuler/MAINTAINERS
https://gitee.com/openeuler/community/blob/master/sig/Kernel/committers.md
Signed-off-by: Wei Li <liwei391(a)huawei.com>
---
openEuler/conf/committers.json | 992 +++++++++++++++++++++++++++++++--
1 file changed, 945 insertions(+), 47 deletions(-)
diff --git a/openEuler/conf/committers.json b/openEuler/conf/committers.json
index 43bab2d..5116737 100644
--- a/openEuler/conf/committers.json
+++ b/openEuler/conf/committers.json
@@ -393,7 +393,7 @@
},
"configs": {
"owner": [
- "UNMAINTAINED"
+ "SuperSix173"
],
"children": {}
},
@@ -505,73 +505,85 @@
},
"kvm_arm.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_asm.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_emulate.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_host.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_hyp.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_mmu.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_mte.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_pgtable.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_pkvm.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_ptrauth.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_ras.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_types.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
@@ -730,6 +742,48 @@
"UNMAINTAINED"
],
"children": {}
+ },
+ "kvm_nested.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ },
+ "mpam.h": {
+ "owner": [
+ "jentlestea"
+ ],
+ "children": {}
+ },
+ "mpam_sched.h": {
+ "owner": [
+ "jentlestea"
+ ],
+ "children": {}
+ },
+ "phytium_machine_types.h": {
+ "owner": [
+ "mao-hongbo"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "uapi": {
+ "owner": [],
+ "children": {
+ "asm": {
+ "owner": [],
+ "children": {
+ "kvm.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ }
+ }
}
}
}
@@ -784,13 +838,15 @@
},
"mpam": {
"owner": [
- "stkid"
+ "stkid",
+ "jentlestea"
],
"children": {}
},
"pci.c": {
"owner": [
- "stkid"
+ "stkid",
+ "Young1c"
],
"children": {}
},
@@ -846,7 +902,8 @@
},
"kvm": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
@@ -1492,43 +1549,50 @@
},
"kvm_host.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_page_track.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_para.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_types.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_vcpu_regs.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvmclock.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm-x86-ops.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
@@ -1693,6 +1757,44 @@
"UNMAINTAINED"
],
"children": {}
+ },
+ "kvm-x86-pmu-ops.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "uapi": {
+ "owner": [],
+ "children": {
+ "asm": {
+ "owner": [],
+ "children": {
+ "kvm.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ },
+ "kvm_para.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ },
+ "kvm_perf.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ }
+ }
}
}
}
@@ -1810,12 +1912,24 @@
"xukuohai"
],
"children": {}
+ },
+ "cpu": {
+ "owner": [],
+ "children": {
+ "zhaoxin.c": {
+ "owner": [
+ "liuxinux"
+ ],
+ "children": {}
+ }
+ }
}
}
},
"kvm": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
@@ -1830,8 +1944,26 @@
"UNMAINTAINED"
],
"children": {}
+ },
+ "configs": {
+ "owner": [
+ "SuperSix173"
+ ],
+ "children": {}
}
}
+ },
+ "loongarch": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "risc-v": {
+ "owner": [
+ "whoisxxx"
+ ],
+ "children": {}
}
}
},
@@ -2039,6 +2171,133 @@
"wkfxxx"
],
"children": {}
+ },
+ "ABI": {
+ "owner": [],
+ "children": {
+ "testing": {
+ "owner": [],
+ "children": {
+ "debugfs-hisi-zip": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {}
+ },
+ "debugfs-hisi-sec": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {}
+ },
+ "debugfs-hisi-hpre": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "admin-guide": {
+ "owner": [],
+ "children": {
+ "perf": {
+ "owner": [],
+ "children": {
+ "hisi-pcie-pmu.rst": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {}
+ },
+ "hisi-pmu.rst": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "devicetree": {
+ "owner": [],
+ "children": {
+ "bindings": {
+ "owner": [],
+ "children": {
+ "infiniband": {
+ "owner": [],
+ "children": {
+ "hisilicon-hns-roce.txt": {
+ "owner": [
+ "hellotcc"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "scsi": {
+ "owner": [],
+ "children": {
+ "hisilicon-sas.txt": {
+ "owner": [
+ "LiYihang226"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "virt": {
+ "owner": [],
+ "children": {
+ "kvm": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "filesystems": {
+ "owner": [],
+ "children": {
+ "btrfs.rst": {
+ "owner": [
+ "jiaoff"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "loongarch": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "translations": {
+ "owner": [],
+ "children": {
+ "zh_CN": {
+ "owner": [],
+ "children": {
+ "loongarch": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
}
}
},
@@ -2063,6 +2322,59 @@
"wkfxxx"
],
"children": {}
+ },
+ "pci_irq.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "pci_link.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "pci_mcfg.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "pci_root.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "pci_slot.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "apei": {
+ "owner": [
+ "hunan4222"
+ ],
+ "children": {}
+ },
+ "arm64": {
+ "owner": [],
+ "children": {
+ "mpam.c": {
+ "owner": [
+ "jentlestea"
+ ],
+ "children": {}
+ },
+ "mpam_v2.c": {
+ "owner": [
+ "jentlestea"
+ ],
+ "children": {}
+ }
+ }
}
}
},
@@ -2070,7 +2382,14 @@
"owner": [
"zhangyi089"
],
- "children": {}
+ "children": {
+ "ahci.c": {
+ "owner": [
+ "LiYihang226"
+ ],
+ "children": {}
+ }
+ }
},
"base": {
"owner": [
@@ -2319,7 +2638,38 @@
"owner": [
"lujialin2"
],
- "children": {}
+ "children": {
+ "btlock.h": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "ipmi_si.h": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "ipmi_si_intf.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "ipmi_si_ls2k500.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "kcs_bmc_ls2k500.h": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
},
"Kconfig": {
"owner": [
@@ -2363,7 +2713,14 @@
"owner": [
"oskernel0719"
],
- "children": {}
+ "children": {
+ "loongson3-acpi-cpufreq.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
},
"cpuidle": {
"owner": [
@@ -2460,19 +2817,101 @@
"owner": [
"yuehaibing_planb"
],
- "children": {}
+ "children": {
+ "hw": {
+ "owner": [],
+ "children": {
+ "hns": {
+ "owner": [
+ "hellotcc"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
},
"iommu": {
"owner": [
"qinirao"
],
- "children": {}
+ "children": {
+ "hisilicon": {
+ "owner": [
+ "hucz",
+ "wsoydl",
+ "JerryHZ"
+ ],
+ "children": {}
+ }
+ }
},
"irqchip": {
"owner": [
"wangxiongfeng"
],
- "children": {}
+ "children": {
+ "irq-loongson-eiointc.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-loongson-htpic.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-loongson-htvec.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-loongson-liointc.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-loongson-pch-lpc.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-loongson-pch-msi.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-loongson-pch-pic.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-loongarch-cpu.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ },
+ "irq-gic-phytium-2500-its.c": {
+ "owner": [
+ "mao-hongbo"
+ ],
+ "children": {}
+ },
+ "irq-gic-phytium-2500.c": {
+ "owner": [
+ "mao-hongbo"
+ ],
+ "children": {}
+ }
+ }
},
"Kconfig": {
"owner": [
@@ -2796,6 +3235,12 @@
"zhangyi089"
],
"children": {}
+ },
+ "bcache": {
+ "owner": [
+ "colyli"
+ ],
+ "children": {}
}
}
},
@@ -2822,7 +3267,65 @@
"owner": [
"yuehaibing_planb"
],
- "children": {}
+ "children": {
+ "ethernet": {
+ "owner": [],
+ "children": {
+ "hisilicon": {
+ "owner": [],
+ "children": {
+ "hns3": {
+ "owner": [
+ "WangBoe2022"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "stmicro": {
+ "owner": [],
+ "children": {
+ "stmmac": {
+ "owner": [],
+ "children": {
+ "dwmac-loongson.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "ub": {
+ "owner": [
+ "hucz",
+ "wsoydl",
+ "JerryHZ"
+ ],
+ "children": {}
+ },
+ "netswift": {
+ "owner": [
+ "zhenpengzheng"
+ ],
+ "children": {}
+ },
+ "huawei": {
+ "owner": [],
+ "children": {
+ "bma": {
+ "owner": [
+ "gasonchen"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ }
+ }
},
"nvme": {
"owner": [
@@ -2925,15 +3428,42 @@
},
"pci": {
"owner": [
- "stkid"
+ "stkid",
+ "Young1c"
],
- "children": {}
+ "children": {
+ "controller": {
+ "owner": [],
+ "children": {
+ "pci-loongson.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
},
"perf": {
"owner": [
"xukuohai"
],
- "children": {}
+ "children": {
+ "hisilicon": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {
+ "hns3_pmu.c": {
+ "owner": [
+ "WangBoe2022"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
},
"phy": {
"owner": [
@@ -3428,6 +3958,12 @@
"zhangyi089"
],
"children": {}
+ },
+ "hisi_sas": {
+ "owner": [
+ "LiYihang226"
+ ],
+ "children": {}
}
}
},
@@ -3487,6 +4023,224 @@
"children": {}
}
}
+ },
+ "crypto": {
+ "owner": [],
+ "children": {
+ "hisilicon": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "roh": {
+ "owner": [],
+ "children": {
+ "core": {
+ "owner": [
+ "chenke1978"
+ ],
+ "children": {}
+ },
+ "hw": {
+ "owner": [],
+ "children": {
+ "hns3": {
+ "owner": [
+ "chenke1978"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "hwtracing": {
+ "owner": [],
+ "children": {
+ "ptt": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "i2c": {
+ "owner": [],
+ "children": {
+ "busses": {
+ "owner": [],
+ "children": {
+ "i2c-hisi.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "i2c-loongson.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "spi": {
+ "owner": [],
+ "children": {
+ "spi-hisi-kunpeng.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "spi-hisi-sfc-v3xx.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "spi-loongson.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "gpio": {
+ "owner": [],
+ "children": {
+ "gpio-hisi.c": {
+ "owner": [
+ "Young1c"
+ ],
+ "children": {}
+ },
+ "gpio-loongson.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "gpu": {
+ "owner": [],
+ "children": {
+ "drm": {
+ "owner": [],
+ "children": {
+ "loongson": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "input": {
+ "owner": [],
+ "children": {
+ "serio": {
+ "owner": [],
+ "children": {
+ "i8042-loongsonio.h": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "firmware": {
+ "owner": [],
+ "children": {
+ "efi": {
+ "owner": [],
+ "children": {
+ "libstub": {
+ "owner": [],
+ "children": {
+ "loongarch-stub.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "cper.c": {
+ "owner": [
+ "hunan4222"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "platform": {
+ "owner": [],
+ "children": {
+ "loongarch": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {
+ "loongson_generic_laptop.c": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
+ },
+ "ras": {
+ "owner": [
+ "hunan4222"
+ ],
+ "children": {}
+ },
+ "ub": {
+ "owner": [
+ "hucz",
+ "wsoydl",
+ "JerryHZ"
+ ],
+ "children": {}
+ },
+ "ubus": {
+ "owner": [
+ "hucz",
+ "wsoydl",
+ "JerryHZ"
+ ],
+ "children": {}
+ },
+ "vfio": {
+ "owner": [],
+ "children": {
+ "ubus": {
+ "owner": [
+ "hucz",
+ "wsoydl",
+ "JerryHZ"
+ ],
+ "children": {}
+ }
+ }
}
}
},
@@ -3563,7 +4317,7 @@
},
"btrfs": {
"owner": [
- "UNMAINTAINED"
+ "jiaoff"
],
"children": {}
},
@@ -4270,13 +5024,15 @@
},
"kvm_para.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_types.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
@@ -5149,7 +5905,7 @@
},
"btrfs.h": {
"owner": [
- "UNMAINTAINED"
+ "jiaoff"
],
"children": {}
},
@@ -6708,6 +7464,12 @@
"wangxiongfeng"
],
"children": {}
+ },
+ "arm-gic-phytium-2500.h": {
+ "owner": [
+ "mao-hongbo"
+ ],
+ "children": {}
}
}
},
@@ -6893,31 +7655,36 @@
},
"kvm_dirty_ring.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_host.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_irqfd.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_para.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
"kvm_types.h": {
"owner": [
- "UNMAINTAINED"
+ "kevinzhu1",
+ "yuzenghui"
],
"children": {}
},
@@ -10158,6 +10925,18 @@
"qinirao"
],
"children": {}
+ },
+ "hisi_acc_qm.h": {
+ "owner": [
+ "youngersun"
+ ],
+ "children": {}
+ },
+ "arm_mpam.h": {
+ "owner": [
+ "jentlestea"
+ ],
+ "children": {}
}
}
},
@@ -10369,6 +11148,19 @@
"oskernel0719"
],
"children": {}
+ },
+ "kvm.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ },
+ "btrfs.h": {
+ "owner": [
+ "jiaoff"
+ ],
+ "children": {}
}
}
}
@@ -10431,6 +11223,13 @@
"zhangyi089"
],
"children": {}
+ },
+ "kvm_para.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
}
}
},
@@ -12328,6 +13127,32 @@
"yuehaibing_planb"
],
"children": {}
+ },
+ "kvm_para.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ },
+ "kvm.h": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ },
+ "btrfs.h": {
+ "owner": [
+ "jiaoff"
+ ],
+ "children": {}
+ },
+ "btrfs_tree.h": {
+ "owner": [
+ "jiaoff"
+ ],
+ "children": {}
}
}
},
@@ -12354,7 +13179,14 @@
"owner": [
"yuehaibing_planb"
],
- "children": {}
+ "children": {
+ "hns-abi.h": {
+ "owner": [
+ "hellotcc"
+ ],
+ "children": {}
+ }
+ }
},
"scsi": {
"owner": [
@@ -12376,6 +13208,13 @@
"wangxiongfeng"
],
"children": {}
+ },
+ "kvm": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
}
}
},
@@ -14007,7 +14846,16 @@
"owner": [
"yuehaibing_planb"
],
- "children": {}
+ "children": {
+ "ubl": {
+ "owner": [
+ "hucz",
+ "wsoydl",
+ "JerryHZ"
+ ],
+ "children": {}
+ }
+ }
},
"security": {
"owner": [
@@ -14026,6 +14874,12 @@
"children": {}
}
}
+ },
+ "integrity": {
+ "owner": [
+ "zhujianwei001"
+ ],
+ "children": {}
}
}
},
@@ -14056,6 +14910,12 @@
"wangxiongfeng"
],
"children": {}
+ },
+ "loongarch": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
}
}
},
@@ -14088,7 +14948,19 @@
"owner": [
"xukuohai"
],
- "children": {}
+ "children": {
+ "arch": {
+ "owner": [],
+ "children": {
+ "loongarch": {
+ "owner": [
+ "Hongchen_Zhang"
+ ],
+ "children": {}
+ }
+ }
+ }
+ }
},
"testing": {
"owner": [
@@ -14143,6 +15015,13 @@
"wkfxxx"
],
"children": {}
+ },
+ "kvm": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
}
}
}
@@ -14153,9 +15032,28 @@
"wkfxxx"
],
"children": {}
+ },
+ "kvm": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
+ }
+ }
+ },
+ "virt": {
+ "owner": [],
+ "children": {
+ "kvm": {
+ "owner": [
+ "kevinzhu1",
+ "yuzenghui"
+ ],
+ "children": {}
}
}
}
}
}
-}
+}
\ No newline at end of file
--
2.25.1
1
0
Update to 6.4.0-1.0.1.4
Signed-off-by: kongweibin <kongweibin2(a)huawei.com>
---
SOURCE | 2 +-
kernel.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/SOURCE b/SOURCE
index 846cc42..5c2a9cf 100644
--- a/SOURCE
+++ b/SOURCE
@@ -1 +1 @@
-6.4.0-1.0.0
+6.4.0-1.0.1
diff --git a/kernel.spec b/kernel.spec
index 43775b4..a3c9128 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -11,8 +11,8 @@
%global upstream_version 6.4
%global upstream_sublevel 0
%global devel_release 1
-%global maintenance_release .0.0
-%global pkg_release .3
+%global maintenance_release .0.1
+%global pkg_release .4
%define with_debuginfo 1
# Do not recompute the build-id of vmlinux in find-debuginfo.sh
@@ -873,6 +873,9 @@ fi
%endif
%changelog
+* Tue Aug 1 2023 Kong Weibin <kongweibin2(a)huawei.com> - 6.4.0-1.0.1.4
+- update to 6.4.0-1.0.1.4
+
* Thu Jul 20 2023 Wei Li <liwei391(a)huawei.com> - 6.4.0-1.0.0.3
- provide /boot/symvers-kernelver.gz even no kabichk
--
2.23.0
2
1