diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d4d6cc739..2d20e58ad 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4620,6 +4620,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m # CONFIG_NET_TULIP is not set +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set CONFIG_NET_VENDOR_8390=y # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 6b6ecc72e..3d06fd64d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4596,6 +4596,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m # CONFIG_NET_TULIP is not set +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set CONFIG_NET_VENDOR_8390=y # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 896961036..2e14cfb96 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -4693,6 +4693,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m # CONFIG_NET_TULIP is not set +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set CONFIG_NET_VENDOR_8390=y # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index c4e9414f3..48ffcb496 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -4670,6 +4670,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m # CONFIG_NET_TULIP is not set +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set CONFIG_NET_VENDOR_8390=y # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 6b323b924..571b0f7e8 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -4592,6 +4592,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m # CONFIG_NET_TULIP is not set +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set CONFIG_NET_VENDOR_8390=y # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 5922a557b..5c261af7c 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -4569,6 +4569,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m # CONFIG_NET_TULIP is not set +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set CONFIG_NET_VENDOR_8390=y # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 7c51ac010..c93da919b 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -4206,6 +4206,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m CONFIG_NET_VENDOR_3COM=y CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_ADAPTEC=y @@ -6131,15 +6132,11 @@ CONFIG_SND_SOC_AK5558=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_AMD_ACP3x=m CONFIG_SND_SOC_AMD_ACP5x=m -CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m -CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m -CONFIG_SND_SOC_AMD_VANGOGH_MACH=m -CONFIG_SND_SOC_AMD_YC_MACH=m # CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_ARNDALE is not set CONFIG_SND_SOC_BD28623=m @@ -6150,7 +6147,6 @@ CONFIG_SND_SOC_BD28623=m CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m -CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -6248,7 +6244,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m -CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m @@ -6286,7 +6281,6 @@ CONFIG_SND_SOC_MT8195=m # CONFIG_SND_SOC_NAU8315 is not set CONFIG_SND_SOC_NAU8540=m # CONFIG_SND_SOC_NAU8810 is not set -CONFIG_SND_SOC_NAU8821=m # CONFIG_SND_SOC_NAU8822 is not set CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8825=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 7539aafe6..d3229929e 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -4183,6 +4183,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m CONFIG_NET_VENDOR_3COM=y CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_ADAPTEC=y @@ -6107,15 +6108,11 @@ CONFIG_SND_SOC_AK5558=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_AMD_ACP3x=m CONFIG_SND_SOC_AMD_ACP5x=m -CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m -CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m -CONFIG_SND_SOC_AMD_VANGOGH_MACH=m -CONFIG_SND_SOC_AMD_YC_MACH=m # CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_ARNDALE is not set CONFIG_SND_SOC_BD28623=m @@ -6126,7 +6123,6 @@ CONFIG_SND_SOC_BD28623=m CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m -CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -6224,7 +6220,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m -CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m @@ -6262,7 +6257,6 @@ CONFIG_SND_SOC_MT8195=m # CONFIG_SND_SOC_NAU8315 is not set CONFIG_SND_SOC_NAU8540=m # CONFIG_SND_SOC_NAU8810 is not set -CONFIG_SND_SOC_NAU8821=m # CONFIG_SND_SOC_NAU8822 is not set CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8825=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index da70ceb01..8740dd7bc 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3941,6 +3941,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m CONFIG_NET_VENDOR_3COM=y CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_ADAPTEC=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d9c73ae16..bff21d8e2 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3917,6 +3917,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m CONFIG_NET_VENDOR_3COM=y CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_ADAPTEC=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index f2482c9d1..371f0a752 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3922,6 +3922,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_8390 is not set # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 279ea4375..fcf1ac318 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3898,6 +3898,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_8390 is not set # CONFIG_NET_VENDOR_ADAPTEC is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 145afc24c..b1cb32cda 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4250,6 +4250,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m CONFIG_NET_VENDOR_3COM=y CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_ADAPTEC=y @@ -6183,15 +6184,11 @@ CONFIG_SND_SOC_AK5558=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_AMD_ACP3x=m CONFIG_SND_SOC_AMD_ACP5x=m -CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m -CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m -CONFIG_SND_SOC_AMD_VANGOGH_MACH=m -CONFIG_SND_SOC_AMD_YC_MACH=m # CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_ARNDALE is not set CONFIG_SND_SOC_BD28623=m @@ -6202,7 +6199,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m -CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -6300,7 +6296,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m -CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m @@ -6338,7 +6333,6 @@ CONFIG_SND_SOC_MT8195=m # CONFIG_SND_SOC_NAU8315 is not set CONFIG_SND_SOC_NAU8540=m # CONFIG_SND_SOC_NAU8810 is not set -CONFIG_SND_SOC_NAU8821=m # CONFIG_SND_SOC_NAU8822 is not set CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8825=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 1c47d7a9b..64ec4a0b8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4227,6 +4227,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_NET_TEAM_MODE_RANDOM=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TULIP=y +CONFIG_NET_UDP_TUNNEL=m CONFIG_NET_VENDOR_3COM=y CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_ADAPTEC=y @@ -6159,15 +6160,11 @@ CONFIG_SND_SOC_AK5558=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_AMD_ACP3x=m CONFIG_SND_SOC_AMD_ACP5x=m -CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m -CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m -CONFIG_SND_SOC_AMD_VANGOGH_MACH=m -CONFIG_SND_SOC_AMD_YC_MACH=m # CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_ARNDALE is not set CONFIG_SND_SOC_BD28623=m @@ -6178,7 +6175,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m -CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -6276,7 +6272,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m -CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m @@ -6314,7 +6309,6 @@ CONFIG_SND_SOC_MT8195=m # CONFIG_SND_SOC_NAU8315 is not set CONFIG_SND_SOC_NAU8540=m # CONFIG_SND_SOC_NAU8810 is not set -CONFIG_SND_SOC_NAU8821=m # CONFIG_SND_SOC_NAU8822 is not set CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8825=m diff --git a/kernel.spec b/kernel.spec index 7e307ed2e..521198b17 100755 --- a/kernel.spec +++ b/kernel.spec @@ -128,7 +128,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.15 -%define rpmversion 5.15.13 +%define rpmversion 5.15.14 %define patchversion 5.15 %define pkgrelease 200 @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15.13.tar.xz +Source0: linux-5.15.14.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15.13 -c -mv linux-5.15.13 linux-%{KVERREL} +%setup -q -n kernel-5.15.14 -c +mv linux-5.15.14 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2972,6 +2972,9 @@ fi # # %changelog +* Tue Jan 11 2022 Justin M. Forbes [5.15.14-0] +- Fix up changelog (Justin M. Forbes) + * Wed Jan 05 2022 Justin M. Forbes [5.15.13-0] - Linux v5.15.13 diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index f50f3054b..867962f63 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -71,7 +71,7 @@ index 8ff6dafafdf8..e3f786336cf9 100644 This is normally done in pci_enable_device(), so this option is a temporary workaround diff --git a/Makefile b/Makefile -index 0964b940b889..717685ccae64 100644 +index a469670e7675..cf656b40117c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 02ebbd0aa..44da38817 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.15.13.tar.xz) = ed8a1212a7f0363657df4b60df8f2e1520e82777d45cf5f3fd6ce25940f6b260d2fc71e0e2a09c0f0bf99e6e8ae2b7ef59cf92562d812422bb62c774a1118e87 -SHA512 (kernel-abi-stablelists-5.15.13-200.tar.bz2) = 282bbdd21ca12b54f0b25d7d04d2efab6038aa19bc29f8ff791cad184d4065502bbb638279e51beb6a309229f62a4712b2364c2d8f08ffd469b6120a2e3608d5 -SHA512 (kernel-kabi-dw-5.15.13-200.tar.bz2) = d6c2621d32e96de79a1122a16ae4c8d39ac06f543a83be6c537453ef6959fda884f026edf40a43ae027479cb824712cd14df0c4eedf9ae898b0fdb4b1f1d311e +SHA512 (linux-5.15.14.tar.xz) = 68808e62a14cc4247f0b1a1657a07cd227ac2809c03fa511d7f34b797cd1f470748009dd68e3e0b260177b105151d06a96d14655b163f4efb0733359c01c0dcb +SHA512 (kernel-abi-stablelists-5.15.14-200.tar.bz2) = a47550da3925e909762bf972b102e5b51510f122301d2a4abd9a162123d1cf052bff2d3072130a85a8e89038d75c8dcdde97f8d8484868ad40330d70e466ad5e +SHA512 (kernel-kabi-dw-5.15.14-200.tar.bz2) = 9edfce3d218388876825ae4120aa4f6ab032e51b0c8f7635ed443e8655adc9e26c49f227653f7cf460a60a6df90313b0ed6fc201456fd86a165a303ee8595675