!1380 release 4.19.90-2312.6.0
From: @cloudyyy1234 Reviewed-by: @Lostwayzxc Signed-off-by: @Lostwayzxc
This commit is contained in:
commit
7982ce75d4
20
kernel.spec
20
kernel.spec
@ -12,7 +12,7 @@
|
||||
|
||||
%global KernelVer %{version}-%{release}.%{_target_cpu}
|
||||
|
||||
%global hulkrelease 2312.4.0
|
||||
%global hulkrelease 2312.6.0
|
||||
|
||||
%define with_patch 1
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
Name: kernel
|
||||
Version: 4.19.90
|
||||
Release: %{hulkrelease}.0257
|
||||
Release: %{hulkrelease}.0258
|
||||
Summary: Linux Kernel
|
||||
License: GPLv2
|
||||
URL: http://www.kernel.org/
|
||||
@ -849,6 +849,22 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Dec 27 2023 YunYi Yang <yangyunyi2@huawei.com> - 4.19.90-2312.6.0.0258
|
||||
- !3607 Fix CVE-2023-6546
|
||||
- !3606 perf/core: Fix CVE-2023-6931
|
||||
- tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
|
||||
- tty: n_gsm: fix restart handling via CLD command
|
||||
- perf: Fix perf_event_validate_size() lockdep splat
|
||||
- perf: Fix perf_event_validate_size()
|
||||
- !3417 SCSI: hisi_raid: support SPxxx serial RAID/HBA controllers
|
||||
- !3531 Fix kernel panic occurs during ISO installation on the 20.03 SP3/SP4
|
||||
- i2c: hisi: Only handle the interrupt of the driver's transfer
|
||||
- i2c: hisi: Only use the completion interrupt to finish the transfer
|
||||
- i2c: hisi: Avoid redundant interrupts
|
||||
- !3483 net: Remove acked SYN flag from packet in the transmit queue correctly
|
||||
- net: Remove acked SYN flag from packet in the transmit queue correctly
|
||||
- SCSI: hisi_raid: support SPxxx serial RAID/HBA controllers
|
||||
|
||||
* Wed Dec 20 2023 YunYi Yang <yangyunyi2@huawei.com> - 4.19.90-2312.4.0.0257
|
||||
- !3426 Revert "hrtimers: Push pending hrtimers away from outgoing CPU earlier"
|
||||
- Revert "hrtimers: Push pending hrtimers away from outgoing CPU earlier"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f66e1e7c65e4b9d11334e16fdc609ac8b989dcb5 Mon Sep 17 00:00:00 2001
|
||||
From fe8ca107fdb5dee6da75828cfcad689de344532b Mon Sep 17 00:00:00 2001
|
||||
From: Yonglong Liu <liuyonglong@huawei.com>
|
||||
Date: Sat, 8 Oct 2022 11:34:55 +0800
|
||||
Subject: [PATCH 261/283] net: hns3: add support for Hisilicon ptp sync device
|
||||
@ -32,12 +32,12 @@ Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
||||
create mode 100644 drivers/ptp/ptp_hisi.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 476609d754c3..de12e08442b4 100644
|
||||
index 6ec54a17a7c8..2be5c4406f3e 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -6694,6 +6694,11 @@ S: Supported
|
||||
F: drivers/scsi/hisi_sas/
|
||||
F: Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
|
||||
@@ -6718,6 +6718,11 @@ S: Maintained
|
||||
F: Documentation/scsi/hisi_raid.rst
|
||||
F: drivers/scsi/hisi_raid/
|
||||
|
||||
+HISILICON HNS3 PTP SYNC DRIVER
|
||||
+M: Yonglong Liu <liuyonglong@huawei.com>
|
||||
@ -48,10 +48,10 @@ index 476609d754c3..de12e08442b4 100644
|
||||
M: Jérôme Glisse <jglisse@redhat.com>
|
||||
L: linux-mm@kvack.org
|
||||
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
|
||||
index b89c386c1bc7..3e0417c995e7 100644
|
||||
index 7505b04f928c..fd345bbc7362 100644
|
||||
--- a/arch/arm64/configs/openeuler_defconfig
|
||||
+++ b/arch/arm64/configs/openeuler_defconfig
|
||||
@@ -3241,6 +3241,7 @@ CONFIG_PPS_CLIENT_GPIO=m
|
||||
@@ -3276,6 +3276,7 @@ CONFIG_PPS_CLIENT_GPIO=m
|
||||
#
|
||||
CONFIG_PTP_1588_CLOCK=y
|
||||
CONFIG_DP83640_PHY=m
|
||||
@ -1123,5 +1123,5 @@ index 000000000000..1fcff3c9a90b
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_VERSION(HISI_PTP_VERSION);
|
||||
--
|
||||
2.34.1
|
||||
2.27.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user