From 2d9a7d6077c57594fa30fa91c608696de1539f0f Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Wed, 29 Mar 2023 19:45:28 +0200 Subject: kernel 6.2.8 --- SOURCES/Patchlist.changelog | 3 +++ SOURCES/kernel-ppc64le-debug-fedora.config | 2 ++ SOURCES/kernel-ppc64le-debug-rhel.config | 2 ++ SOURCES/kernel-ppc64le-fedora.config | 2 ++ SOURCES/kernel-ppc64le-rhel.config | 2 ++ SOURCES/patch-6.2-redhat.patch | 25 +++++++++++++++++++++++-- SPECS/kernel.spec | 15 ++++++++++----- 7 files changed, 44 insertions(+), 7 deletions(-) diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index 7e97c3c..2d5398b 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d72fed198ee1835d3950d0cb4787b7f3a082ff40 + d72fed198ee1835d3950d0cb4787b7f3a082ff40 Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/14005bf69741499a3df8cb2e74c0dc99c37e9438 14005bf69741499a3df8cb2e74c0dc99c37e9438 NFS: Correct timing for assigning access cache timestamp diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config index 143cde7..0defeb2 100644 --- a/SOURCES/kernel-ppc64le-debug-fedora.config +++ b/SOURCES/kernel-ppc64le-debug-fedora.config @@ -4708,6 +4708,7 @@ CONFIG_POWER_MLXBF=m CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y # CONFIG_POWERNV_OP_PANEL is not set +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMKONA is not set # CONFIG_POWER_RESET_BRCMSTB is not set CONFIG_POWER_RESET_GPIO_RESTART=y @@ -6824,6 +6825,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config index 60e1733..b3dacc7 100644 --- a/SOURCES/kernel-ppc64le-debug-rhel.config +++ b/SOURCES/kernel-ppc64le-debug-rhel.config @@ -4207,6 +4207,7 @@ CONFIG_POWER9_CPU=y CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y CONFIG_POWERNV_OP_PANEL=m +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set CONFIG_POWER_RESET_GPIO=y @@ -6190,6 +6191,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOSHIBA_HAPS is not set # CONFIG_TOSHIBA_WMI is not set diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index 89ff88e..0bc712a 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -4687,6 +4687,7 @@ CONFIG_POWER_MLXBF=m CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y # CONFIG_POWERNV_OP_PANEL is not set +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMKONA is not set # CONFIG_POWER_RESET_BRCMSTB is not set CONFIG_POWER_RESET_GPIO_RESTART=y @@ -6801,6 +6802,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index 60dcc9a..e841576 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -4186,6 +4186,7 @@ CONFIG_POWER9_CPU=y CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y CONFIG_POWERNV_OP_PANEL=m +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set CONFIG_POWER_RESET_GPIO=y @@ -6167,6 +6168,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOSHIBA_HAPS is not set # CONFIG_TOSHIBA_WMI is not set diff --git a/SOURCES/patch-6.2-redhat.patch b/SOURCES/patch-6.2-redhat.patch index 399e4fb..2442da0 100644 --- a/SOURCES/patch-6.2-redhat.patch +++ b/SOURCES/patch-6.2-redhat.patch @@ -21,6 +21,7 @@ drivers/iommu/iommu.c | 22 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + + drivers/usb/host/xhci-pci.c | 7 +- drivers/usb/typec/ucsi/ucsi.c | 33 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- fs/nfs/dir.c | 2 +- @@ -36,10 +37,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 38 files changed, 997 insertions(+), 197 deletions(-) + 39 files changed, 1000 insertions(+), 201 deletions(-) diff --git a/Makefile b/Makefile -index 43cf2c785cb1..f3441e6f1ed6 100644 +index 2c90d9b067f4..93b82f038789 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1031,6 +1032,26 @@ index 97a0f8faea6e..d837548d2024 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c +index fb988e4ea924..6db07ca419c3 100644 +--- a/drivers/usb/host/xhci-pci.c ++++ b/drivers/usb/host/xhci-pci.c +@@ -771,12 +771,11 @@ static struct pci_driver xhci_pci_driver = { + /* suspend and resume implemented later */ + + .shutdown = usb_hcd_pci_shutdown, +- .driver = { + #ifdef CONFIG_PM +- .pm = &usb_hcd_pci_pm_ops, +-#endif +- .probe_type = PROBE_PREFER_ASYNCHRONOUS, ++ .driver = { ++ .pm = &usb_hcd_pci_pm_ops + }, ++#endif + }; + + static int __init xhci_pci_init(void) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 1cf8947c6d66..086b50968983 100644 --- a/drivers/usb/typec/ucsi/ucsi.c diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 3886d22..be1c75d 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specversion 6.2.7 +%define specversion 6.2.8 %define patchversion 6.2 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.2.7 +%define tarfile_release 6.2.8 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.7 +%define kabiversion 6.2.8 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3388,8 +3388,13 @@ fi # # %changelog -* Thu Mar 23 2023 Jan Drögehoff - 6.2.7-201.fsync -- kernel-fsync v6.2.7 +* Wed Mar 29 2023 Jan Drögehoff - 6.2.8-201.fsync +- kernel-fsync v6.2.8 + +* Wed Mar 22 2023 Augusto Caringi [6.2.8-0] +- Add new config option for 6.2.8 (Augusto Caringi) +- Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" (Kate Hsuan) +- Linux v6.2.8 * Fri Mar 17 2023 Justin M. Forbes [6.2.7-0] - NFS: Correct timing for assigning access cache timestamp (Chengen Du) -- cgit v1.2.3