commit 5f16d82ab82ce29840e32826ca2c387ab64283d6
Author: Jan Palus <[email protected]>
Date: Wed Sep 13 15:57:25 2023 +0200
up to 6.5.3
atheros-disallow-retrain-nongen1-pcie.patch | 4 ++--
kernel-multiarch.config | 12 +++++++++---
kernel.spec | 4 ++--
3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0bda3039..ab59ffd6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define rel 1
%define basever 6.5
-%define postver .2
+%define postver .3
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -121,7 +121,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: 42c2796f9babe4a1be3f2001c817ff4a
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 54a6a3674e1be858de9192747b92521b
+# Patch0-md5: 9b7eb1bb06ec9d72210050577791adc6
%endif
Source1: kernel.sysconfig
diff --git a/atheros-disallow-retrain-nongen1-pcie.patch
b/atheros-disallow-retrain-nongen1-pcie.patch
index 99a81c3e..c295bf23 100644
--- a/atheros-disallow-retrain-nongen1-pcie.patch
+++ b/atheros-disallow-retrain-nongen1-pcie.patch
@@ -191,8 +191,8 @@ Changes since v2:
* pcie_aspm_configure_common_clock: check if the 2 ends of a link
* could use common clock. If they are, configure them to use the
@@ -257,7 +295,14 @@
- reg16 &= ~PCI_EXP_LNKCTL_CCC;
- pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16);
+ pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,
+ PCI_EXP_LNKCTL_CCC, ccc);
- if (pcie_retrain_link(link->pdev, true)) {
+ bool skip_retrain = false;
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 7ebb03cd..fc278155 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -4893,6 +4893,7 @@ DVB_FIREDTV all=m
#- *** FILE: drivers/media/i2c/Kconfig ***
#-
#- IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+VIDEO_CAMERA_SENSOR all=y
VIDEO_AR0521 all=m
VIDEO_HI556 all=m
VIDEO_HI846 all=m
@@ -5060,7 +5061,7 @@ MEDIA_PCI_SUPPORT all=y
#- file drivers/media/pci/smipcie/Kconfig goes here
#- file drivers/media/pci/ttpci/Kconfig goes here
VIDEO_PCI_SKELETON all=m
-#- file drivers/media/pci/intel/ipu3/Kconfig goes here
+#- file drivers/media/pci/intel/Kconfig goes here
#-
#- *** FILE: drivers/media/pci/b2c2/Kconfig ***
@@ -12336,6 +12337,7 @@ MISC_FILESYSTEMS all=y
#- file fs/ufs/Kconfig goes here
#- file fs/erofs/Kconfig goes here
#- file fs/vboxsf/Kconfig goes here
+#- file fs/aufs/Kconfig goes here
NETWORK_FILESYSTEMS all=y
#- file fs/nfs/Kconfig goes here
#- file fs/nfsd/Kconfig goes here
@@ -12382,6 +12384,12 @@ AFS_DEBUG all=n
AFS_FSCACHE all=y
AFS_DEBUG_CURSOR all=n
+#-
+#- *** FILE: fs/aufs/Kconfig ***
+#-
+AUFS_FHSM all=y
+AUFS_DIRREN all=y
+
#-
#- *** FILE: fs/autofs/Kconfig ***
#-
@@ -16007,8 +16015,6 @@ RD_ZSTD all=y
#-
#- *** PROBABLY REMOVED OPTIONS ***
#-
-AUFS_DIRREN all=y
-AUFS_FHSM all=y
AUTOFS4_FS all=m
MCDI_LOGGING arm64=n
MFD_MAX597X arm=m arm64=m
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5f16d82ab82ce29840e32826ca2c387ab64283d6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
