diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-17 10:58:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-17 10:58:56 +0200 |
| commit | 8de46532d4f04e16b96ae45cd21517503dacfaf1 (patch) | |
| tree | 02e20dea34c1f5ab3dc8ecba359cd19e10eb0f66 | |
| parent | 2f3fdd91374544373efb5cea276fd8dcb7231f59 (diff) | |
| parent | 3c40490732ea0f9a86e919a72dd0fc233419d808 (diff) | |
| download | kernel-8de46532d4f04e16b96ae45cd21517503dacfaf1.tar.gz kernel-8de46532d4f04e16b96ae45cd21517503dacfaf1.tar.xz kernel-8de46532d4f04e16b96ae45cd21517503dacfaf1.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 3 | ||||
| -rw-r--r-- | patch-5.14-redhat.patch | 44 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 15 insertions, 38 deletions
diff --git a/kernel.spec b/kernel.spec index 090157a49..5e9b66eb8 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2963,6 +2963,9 @@ fi # # %changelog +* Wed Oct 13 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.12-0] +- Linux v5.14.12 + * Sun Oct 10 2021 Justin M. Forbes <jforbes@fedoraproject.org> [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 <linux/delay.h> - #include <linux/mfd/syscon.h> - #include <linux/regmap.h> -+#include <linux/pm_runtime.h> - - #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 @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.19-200.tar.bz2) = 7d28816c431019c9f09b7bcda4eb43ed2c3a7cbb8199af0fecccf16bff3ac992e2c9ed3acc2d06d7c8ebec3dc9ad76d0975cc179d2e4b7541af2af05f7e35de6 -SHA512 (linux-5.14.11.tar.xz) = 9490ea77b018697a0d5f12e7e1df6e447eafb28d33068cf3df35a587dd6c2280ffe5b98fc3d10beeb9d6855f5f9d939dd0a8fea7350147af02a48d65e6207dfb -SHA512 (kernel-abi-stablelists-5.14.11-200.tar.bz2) = 1a4771740a2d03a1cb0a42176948d748950396e9403e8f05d38d5ce33fe40f3a785fbe1126f493bfaf8cebe8abf4ebcd74887c83ea4e7e86eb2ac6ad1d174277 -SHA512 (kernel-kabi-dw-5.14.11-200.tar.bz2) = 530bb9a9e1aac882378d9d55d410b284870c62cef9da18d817fafdbc183f7e949b71e2dcfee82dff9ad18faf6be5489b08cb48e2289f0b07edc8dbe2a5488a5c +SHA512 (linux-5.14.12.tar.xz) = a23f1d652533bf047215375a94f6562d46289dd744bcd9241a66edd69f999931ce71356f61601f30a6da2edc4e1a6defd90d5f3dc5f3382fbb4141f25448397f +SHA512 (kernel-abi-stablelists-5.14.12-200.tar.bz2) = 2cd10d833c39defdfb11316c0d69720ebf1dc8ae5e07fd7eb7498a9c6cdec9989cfddd61ceb5bc415baffccd52166c45ba3d65cb5a67b3a5f29e886c23e4e040 +SHA512 (kernel-kabi-dw-5.14.12-200.tar.bz2) = 6329bb435b8572caba50cb4a5b8fc435637ef1eff69bdac8e99b4cc7e1cc6f46d5da48fa1282ee43118db4d0c3372dd738787acf690496ccb7a4f5058755e6ce |