From 6ecae4955e194c20a5aca43d052a88acf58536ed Mon Sep 17 00:00:00 2001 From: ZhangPeng Date: Sat, 21 Dec 2024 12:28:02 +0800 Subject: [PATCH 1/2] release 6.6.0-70.0.0 --- SOURCE | 2 +- kernel.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SOURCE b/SOURCE index 0a96783f..d2516281 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -6.6.0-69.0.0 +6.6.0-70.0.0 diff --git a/kernel.spec b/kernel.spec index 82a4e83f..66009b9f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,9 +40,9 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_version 6.6 %global upstream_sublevel 0 -%global devel_release 69 +%global devel_release 70 %global maintenance_release .0.0 -%global pkg_release .75 +%global pkg_release .76 %global openeuler_lts 1 %global openeuler_major 2403 @@ -1092,6 +1092,12 @@ fi %endif %changelog +* Sat Dec 21 2024 ZhangPeng - 6.6.0-70.0.0.76 +- !14251 kabi reserver space for i2c +- kabi reserver space for i2c +- !14258 v2 scsi: hisi_sas: Enable force phy when SATA disk directly connected +- scsi: hisi_sas: Enable force phy when SATA disk directly connected + * Thu Dec 19 2024 ZhangPeng - 6.6.0-69.0.0.75 - !14221 KABI for cgroup - cgroup: add more reserve kabi -- Gitee From fd5e1cd6dc07aa3a98d2796e22984e4556e70480 Mon Sep 17 00:00:00 2001 From: ZhangPeng Date: Sat, 21 Dec 2024 12:37:32 +0800 Subject: [PATCH 2/2] Update kabi symvers for kabi reserve Signed-off-by: ZhangPeng --- Module.kabi_aarch64 | 4 ++-- Module.kabi_ext2_aarch64 | 4 ++-- Module.kabi_ext2_x86_64 | 4 ++-- Module.kabi_x86_64 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Module.kabi_aarch64 b/Module.kabi_aarch64 index 4ea27a9e..0725ff04 100644 --- a/Module.kabi_aarch64 +++ b/Module.kabi_aarch64 @@ -613,8 +613,8 @@ 0x848f3b5f hwmon_device_register_with_info vmlinux EXPORT_SYMBOL_GPL 0xa0f06128 hwmon_device_unregister vmlinux EXPORT_SYMBOL_GPL 0x239a570e hwmon_notify_event vmlinux EXPORT_SYMBOL_GPL -0xf3899099 i2c_add_adapter vmlinux EXPORT_SYMBOL -0x26127154 i2c_del_adapter vmlinux EXPORT_SYMBOL +0x0a94e2fd i2c_add_adapter vmlinux EXPORT_SYMBOL +0xb3d3132a i2c_del_adapter vmlinux EXPORT_SYMBOL 0x497ab3e4 __ib_alloc_cq drivers/infiniband/core/ib_core EXPORT_SYMBOL 0x6b2f13c5 _ib_alloc_device drivers/infiniband/core/ib_core EXPORT_SYMBOL 0xe197c920 __ib_alloc_pd drivers/infiniband/core/ib_core EXPORT_SYMBOL diff --git a/Module.kabi_ext2_aarch64 b/Module.kabi_ext2_aarch64 index f39eb837..adfc4792 100644 --- a/Module.kabi_ext2_aarch64 +++ b/Module.kabi_ext2_aarch64 @@ -796,8 +796,8 @@ 0xc16952e7 __devm_mdiobus_register vmlinux EXPORT_SYMBOL 0x93734c64 phy_find_first vmlinux EXPORT_SYMBOL 0x95e714ad phy_attached_info vmlinux EXPORT_SYMBOL -0xf3899099 i2c_add_adapter vmlinux EXPORT_SYMBOL -0x26127154 i2c_del_adapter vmlinux EXPORT_SYMBOL +0x0a94e2fd i2c_add_adapter vmlinux EXPORT_SYMBOL +0xb3d3132a i2c_del_adapter vmlinux EXPORT_SYMBOL 0x124b7885 ptp_clock_register vmlinux EXPORT_SYMBOL 0x52872f4d ptp_clock_unregister vmlinux EXPORT_SYMBOL 0xffaa4403 ptp_clock_event vmlinux EXPORT_SYMBOL diff --git a/Module.kabi_ext2_x86_64 b/Module.kabi_ext2_x86_64 index baee8683..36320944 100644 --- a/Module.kabi_ext2_x86_64 +++ b/Module.kabi_ext2_x86_64 @@ -821,8 +821,8 @@ 0x0d21b561 __devm_mdiobus_register vmlinux EXPORT_SYMBOL 0x15440997 phy_find_first vmlinux EXPORT_SYMBOL 0xb1613b40 phy_attached_info vmlinux EXPORT_SYMBOL -0xc758aa70 i2c_add_adapter vmlinux EXPORT_SYMBOL -0x6dda0c2c i2c_del_adapter vmlinux EXPORT_SYMBOL +0xd9aad07f i2c_add_adapter vmlinux EXPORT_SYMBOL +0x9ed5a66c i2c_del_adapter vmlinux EXPORT_SYMBOL 0xd1d3571a ptp_clock_register vmlinux EXPORT_SYMBOL 0xa55d7cac ptp_clock_unregister vmlinux EXPORT_SYMBOL 0x5ef0c711 ptp_clock_event vmlinux EXPORT_SYMBOL diff --git a/Module.kabi_x86_64 b/Module.kabi_x86_64 index 340328b7..63e683a6 100644 --- a/Module.kabi_x86_64 +++ b/Module.kabi_x86_64 @@ -655,8 +655,8 @@ 0x1591b2c6 hyperv_read_cfg_blk drivers/pci/controller/pci-hyperv-intf EXPORT_SYMBOL_GPL 0x221394ae hyperv_reg_block_invalidate drivers/pci/controller/pci-hyperv-intf EXPORT_SYMBOL_GPL 0xe5f73406 hyperv_write_cfg_blk drivers/pci/controller/pci-hyperv-intf EXPORT_SYMBOL_GPL -0xc758aa70 i2c_add_adapter vmlinux EXPORT_SYMBOL -0x6dda0c2c i2c_del_adapter vmlinux EXPORT_SYMBOL +0xd9aad07f i2c_add_adapter vmlinux EXPORT_SYMBOL +0x9ed5a66c i2c_del_adapter vmlinux EXPORT_SYMBOL 0x61760034 _ib_alloc_device drivers/infiniband/core/ib_core EXPORT_SYMBOL 0xb4dd0ffa ib_dealloc_device drivers/infiniband/core/ib_core EXPORT_SYMBOL 0x9458136b ibdev_err drivers/infiniband/core/ib_core EXPORT_SYMBOL -- Gitee