kernel 5.14.12

2 files changed, 18 insertions, 41 deletions

diff --git a/SOURCES/patch-5.14-redhat.patch b/SOURCES/patch-5.14-redhat.patch
index 73a387e..9907a16 100644
--- a/SOURCES/patch-5.14-redhat.patch
+++ b/SOURCES/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
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 92f2475..2811737 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/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 301
 
@@ -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
 
@@ -1366,8 +1366,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} .
@@ -2974,8 +2974,11 @@ fi
 #
 #
 %changelog
-* Tue Oct 12 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.11-301.fsync
-- Linux v5.14.11 futex2 zen openrgb
+* Wed Oct 20 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.12-301.fsync
+- Linux v5.14.12 futex2 zen openrgb
+
+* 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