From 808d827ce08099a341c77b559fb7b6d261056286 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 8 Sep 2021 10:42:13 -0500 Subject: kernel-5.14.2-0 * Wed Sep 08 2021 Justin M. Forbes [5.14.2-0] - Revert "team: mark team driver as deprecated" (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 13 +++++++----- patch-5.14-redhat.patch | 37 +-------------------------------- sources | 6 +++--- 18 files changed, 29 insertions(+), 58 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 5526cc1da..54cd3ea2e 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/e11905f1a6ea9f03a9f1a3b061a1a581536a2850 + e11905f1a6ea9f03a9f1a3b061a1a581536a2850 Revert "team: mark team driver as deprecated" + https://gitlab.com/cki-project/kernel-ark/-/commit/927ba0b97c46e67b851bffe5a5b059e2c150e30b 927ba0b97c46e67b851bffe5a5b059e2c150e30b iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a6037b21f..cf936535e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6981,7 +6981,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b6dc0f546..dbb913ce0 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6956,7 +6956,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 4a3035b78..c4fd88d5a 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7136,7 +7136,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index eef6575f7..b8b41afc6 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -7112,7 +7112,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 932717cf7..12b27f149 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6927,7 +6927,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 66f96eed9..f4d48b7d8 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6903,7 +6903,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 219f75545..a4c2e2a16 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -6314,7 +6314,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 4f3f23d60..2158fc190 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -6290,7 +6290,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index f7c293a64..34323c2ec 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5983,7 +5983,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index ec4986cc8..b044d5937 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5958,7 +5958,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0c76512ee..23eb05f75 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5934,7 +5934,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index a93532691..5c4fc12d7 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5909,7 +5909,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 4eaeb7f41..302e2ceff 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6364,7 +6364,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 5956fccfe..2cd077ae3 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6340,7 +6340,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel.spec b/kernel.spec index 36480b3e0..1daafe1a8 100755 --- a/kernel.spec +++ b/kernel.spec @@ -123,7 +123,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.14 -%define rpmversion 5.14.1 +%define rpmversion 5.14.2 %define patchversion 5.14 %define pkgrelease 300 @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.1.tar.xz +Source0: linux-5.14.2.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.1 -c -mv linux-5.14.1 linux-%{KVERREL} +%setup -q -n kernel-5.14.2 -c +mv linux-5.14.2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2958,7 +2958,10 @@ fi # # %changelog -* Fri Sep 03 2021 Justin M. Forbes [5.14.1-300] +* Wed Sep 08 2021 Justin M. Forbes [5.14.2-0] +- Revert "team: mark team driver as deprecated" (Justin M. Forbes) + +* Fri Sep 03 2021 Justin M. Forbes [5.14.1-0] - Setup for building fedora-5.14 branch (Justin M. Forbes) * Mon Aug 30 2021 Justin M. Forbes [5.14-0] diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch index 61a0b219f..0bdb9dfad 100644 --- a/patch-5.14-redhat.patch +++ b/patch-5.14-redhat.patch @@ -21,7 +21,6 @@ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + drivers/input/rmi4/rmi_driver.c | 124 +++-- drivers/iommu/iommu.c | 22 + - drivers/net/team/team.c | 2 + drivers/net/wireguard/main.c | 6 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + drivers/pci/quirks.c | 24 + @@ -53,7 +52,7 @@ tools/testing/selftests/bpf/progs/linked_maps2.c | 76 --- tools/testing/selftests/bpf/progs/linked_vars1.c | 54 -- tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- - 55 files changed, 658 insertions(+), 1495 deletions(-) + 54 files changed, 656 insertions(+), 1495 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2fb7012c3246..47718b4f2f75 100644 @@ -1259,19 +1258,6 @@ index 63f0af10c403..195be16dbd39 100644 /* * Changes the default domain of an iommu group that has *only* one device * -diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c -index dd7917cab2b1..f6b43adb2ced 100644 ---- a/drivers/net/team/team.c -+++ b/drivers/net/team/team.c -@@ -3045,6 +3045,8 @@ static int __init team_module_init(void) - if (err) - goto err_nl_init; - -+ mark_hardware_deprecated(DRV_NAME); -+ - return 0; - - err_nl_init: diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c index 75dbe77b0b4b..4bd6dd722f44 100644 --- a/drivers/net/wireguard/main.c @@ -3072,24 +3058,3 @@ index e4f5bd388a3c..000000000000 -} - -char LICENSE[] SEC("license") = "GPL"; -commit e11905f1a6ea9f03a9f1a3b061a1a581536a2850 -Author: Justin M. Forbes -Date: Fri Sep 3 10:54:07 2021 -0500 - - Revert "team: mark team driver as deprecated" - - This is a RHEL only patch and should not be in the Fedora kernel. - -diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c -index f6b43adb2ced..dd7917cab2b1 100644 ---- a/drivers/net/team/team.c -+++ b/drivers/net/team/team.c -@@ -3045,8 +3045,6 @@ static int __init team_module_init(void) - if (err) - goto err_nl_init; - -- mark_hardware_deprecated(DRV_NAME); -- - return 0; - - err_nl_init: diff --git a/sources b/sources index 60fa18d30..a1463c101 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.1.tar.xz) = 3d22a5b071b96cb6ebe9e804deef8ed78cf07efcfaaa7293a04ca3e7c817c7c08e8b39920ee74a89854ba6e27466695bec99d3bf2d6a9f83966185b5bc023377 -SHA512 (kernel-abi-stablelists-5.14.1-300.tar.bz2) = aacff5cd48792b760f067c3a02caffcc4f32d6a03ff29389061e64a919127730f9d611118f011145cb047ade8a7bbdb55e81da678cbaee9ae32f977d5fbcd441 -SHA512 (kernel-kabi-dw-5.14.1-300.tar.bz2) = 43c9b58d15e50b957921c805d37f3abdf063df77eb9181c81d847318abc4993962548632545a0aab645c6acac84c1ed68e695c74e5384fb44a158eed22da88d0 +SHA512 (linux-5.14.2.tar.xz) = baefe357d9a9d4d8f2ba8b2b1f1ac3edda671b9ca31d675944af295ff752bffadfce51dd968d33a4876ef150d04ac299f63ecc41468a8bf32f1f9a4edd13ea34 +SHA512 (kernel-abi-stablelists-5.14.2-300.tar.bz2) = 418b6b773015e3901e377e5645952bb2f1556c7136134fbc90120aec54854dac03dedbe8367216ca97b9f332b3155f7ba8d3edf96680d88d9d6d39fd64ff9f82 +SHA512 (kernel-kabi-dw-5.14.2-300.tar.bz2) = e224ed2aa1feadfdda661019280b36b55d4ee113217fc8b348645ed6100f81d22663e2fe4e39d8d7574dbe2bac863264cc6407633e5a332f4fc739650d5cec73 -- cgit