From 34cf2ac106003a67aa49a8d11338671d89a8eb5a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 13 Oct 2021 08:48:39 -0500 Subject: kernel-5.14.12-0 * Wed Oct 13 2021 Justin M. Forbes [5.14.12-0] - Linux v5.14.12 Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 11 +++++++---- patch-5.14-redhat.patch | 44 +++++++++----------------------------------- sources | 6 +++--- 3 files changed, 19 insertions(+), 42 deletions(-) diff --git a/kernel.spec b/kernel.spec index a43e5e5c3..c02eecffd 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.11 +%define rpmversion 5.14.12 %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.11.tar.xz +Source0: linux-5.14.12.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.11 -c -mv linux-5.14.11 linux-%{KVERREL} +%setup -q -n kernel-5.14.12 -c +mv linux-5.14.12 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2958,6 +2958,9 @@ fi # # %changelog +* Wed Oct 13 2021 Justin M. Forbes [5.14.12-0] +- Linux v5.14.12 + * Sun Oct 10 2021 Justin M. Forbes [5.14.11-0] - Linux v5.14.11 diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch index 73a387e96..9907a16ab 100644 --- a/patch-5.14-redhat.patch +++ b/patch-5.14-redhat.patch @@ -24,7 +24,7 @@ drivers/net/ethernet/intel/e1000e/ich8lan.c | 31 +- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + drivers/net/ethernet/intel/e1000e/netdev.c | 29 +- - drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 9 + + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 + drivers/net/wireguard/main.c | 6 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + @@ -36,7 +36,6 @@ include/linux/rmi.h | 1 + include/linux/security.h | 5 + init/Kconfig | 2 +- - kernel/bpf/stackmap.c | 3 +- kernel/module_signing.c | 9 +- mm/cma.c | 10 + security/integrity/platform_certs/load_uefi.c | 6 +- @@ -56,7 +55,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 --- - 58 files changed, 716 insertions(+), 1511 deletions(-) + 57 files changed, 709 insertions(+), 1510 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2fb7012c3246..47718b4f2f75 100644 @@ -1386,28 +1385,18 @@ index 757a54c39eef..774f849027f0 100644 { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ }; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c -index ed817011a94a..280ac0129572 100644 +index 6924a6aacbd5..60461ff4deae 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "stmmac_platform.h" - -@@ -1528,6 +1529,9 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) +@@ -1529,6 +1529,7 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) return ret; } + pm_runtime_enable(dev); -+ pm_runtime_get_sync(dev); -+ - if (bsp_priv->integrated_phy) - rk_gmac_integrated_phy_powerup(bsp_priv); + pm_runtime_get_sync(dev); -@@ -1536,9 +1540,14 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) + if (bsp_priv->integrated_phy) +@@ -1539,10 +1540,13 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) static void rk_gmac_powerdown(struct rk_priv_data *gmac) { @@ -1416,12 +1405,11 @@ index ed817011a94a..280ac0129572 100644 if (gmac->integrated_phy) rk_gmac_integrated_phy_powerdown(gmac); -+ pm_runtime_put_sync(dev); + pm_runtime_put_sync(&gmac->pdev->dev); + pm_runtime_disable(dev); -+ + phy_power_on(gmac, false); gmac_clk_enable(gmac, false); - } diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c index 75dbe77b0b4b..4bd6dd722f44 100644 --- a/drivers/net/wireguard/main.c @@ -1696,20 +1684,6 @@ index 55f9f7738ebb..564553afb251 100644 select IO_WQ default y help -diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c -index 6fbc2abe9c91..2553caf4f74a 100644 ---- a/kernel/bpf/stackmap.c -+++ b/kernel/bpf/stackmap.c -@@ -63,7 +63,8 @@ static inline int stack_map_data_size(struct bpf_map *map) - - static int prealloc_elems_and_freelist(struct bpf_stack_map *smap) - { -- u32 elem_size = sizeof(struct stack_map_bucket) + smap->map.value_size; -+ u64 elem_size = sizeof(struct stack_map_bucket) + -+ (u64)smap->map.value_size; - int err; - - smap->elems = bpf_map_area_alloc(elem_size * smap->map.max_entries, diff --git a/kernel/module_signing.c b/kernel/module_signing.c index 8723ae70ea1f..fb2d773498c2 100644 --- a/kernel/module_signing.c diff --git a/sources b/sources index 234d90e7e..ededb923d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.11.tar.xz) = 9490ea77b018697a0d5f12e7e1df6e447eafb28d33068cf3df35a587dd6c2280ffe5b98fc3d10beeb9d6855f5f9d939dd0a8fea7350147af02a48d65e6207dfb -SHA512 (kernel-abi-stablelists-5.14.11-300.tar.bz2) = d8f4888c45b92addba2a6395eca46da53347224784555148014b2a4815dd86b8153af089ce467d233e46c8e945fd1a6e8ec35519e10dbb0d757fb6027c02233c -SHA512 (kernel-kabi-dw-5.14.11-300.tar.bz2) = 530bb9a9e1aac882378d9d55d410b284870c62cef9da18d817fafdbc183f7e949b71e2dcfee82dff9ad18faf6be5489b08cb48e2289f0b07edc8dbe2a5488a5c +SHA512 (linux-5.14.12.tar.xz) = a23f1d652533bf047215375a94f6562d46289dd744bcd9241a66edd69f999931ce71356f61601f30a6da2edc4e1a6defd90d5f3dc5f3382fbb4141f25448397f +SHA512 (kernel-abi-stablelists-5.14.12-300.tar.bz2) = fc767f5206a211ec2fd59a67e42ddf37c77d57ac0e34e4e64efe100e59358a820d470258a3bab7849cc24922bbab35d4f9c52e34b5db4e2aec1fa75f9143990b +SHA512 (kernel-kabi-dw-5.14.12-300.tar.bz2) = 6329bb435b8572caba50cb4a5b8fc435637ef1eff69bdac8e99b4cc7e1cc6f46d5da48fa1282ee43118db4d0c3372dd738787acf690496ccb7a4f5058755e6ce -- cgit