Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora

3 files changed, 32 insertions, 11 deletions

diff --git a/kernel.spec b/kernel.spec
index c8423fb1c..29fbdacaa 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2891,14 +2891,35 @@ fi
 #
 #
 %changelog
-* Thu Aug 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.10-200]
+* Tue Aug 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.11-200]
+- kernel-5.13.11-0 (Justin M. Forbes)
 - bpf: Fix integer overflow involving bucket_size (Tatsuhiko Yasumatsu)
-- kernel-5.13.10-0 (Justin M. Forbes)
+
+* Thu Aug 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.10-0]
 - Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes)
 - ASoC: Intel: sof_sdw_max98373: remove useless inits (Pierre-Louis Bossart)
 - ASoC: Intel: update sof_pcm512x quirks (Pierre-Louis Bossart)
 - ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant (jairaj arava)
 - ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart)
+- kernel-5.13.9-0 (Justin M. Forbes)
+- drm/i915/dp: Use max params for older panels (Kai-Heng Feng)
+- pinctrl: tigerlake: Fix GPIO mapping for newer version of software (Andy Shevchenko)
+- kernel-5.13.8-0 (Justin M. Forbes)
+- Re-enable sermouse for x86 (rhbz 1974002) (Justin M. Forbes)
+- Revert CRYPTO_ECDH and CRYPTO_ECDA from builtin to module to fix fips (Justin M. Forbes)
+- drm/rockchip: remove existing generic drivers to take over the device (Javier Martinez Canillas)
+- powerpc/pseries: Fix regression while building external modules (Srikar Dronamraju)
+- kernel-5.13.7-0 (Justin M. Forbes)
+- kernel-5.13.6-0 (Justin M. Forbes)
+- kernel-5.13.5-0 (Justin M. Forbes)
+- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes)
+- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes)
+- RHEL configs need this too (Justin M. Forbes)
+- kernel-5.13.4-0 (Justin M. Forbes)
+- Config update for 5.13.4 (Justin M. Forbes)
+- kernel-5.13.3-0 (Justin M. Forbes)
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang)
 
 * Sun Aug 08 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.9-0]
 - drm/i915/dp: Use max params for older panels (Kai-Heng Feng)
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch
index 2e1778e8b..d25c40da5 100644
--- a/patch-5.13-redhat.patch
+++ b/patch-5.13-redhat.patch
@@ -99,7 +99,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
 
  Boot into System Kernel
 diff --git a/Makefile b/Makefile
-index 4e9f877f513f..6123e12d63e2 100644
+index eaf1df54ad12..96c289777a99 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -508,6 +508,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
@@ -2126,10 +2126,10 @@ index ab7eea01ab42..fff7c5f737fc 100644
 
  int rmi_register_transport_device(struct rmi_transport_dev *xport);
 diff --git a/include/linux/security.h b/include/linux/security.h
-index 06f7c50ce77f..09ed686ac5e6 100644
+index 0acd1b68bf30..a02717d46d6d 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -471,6 +471,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
+@@ -472,6 +472,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
  int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
  int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
  int security_locked_down(enum lockdown_reason what);
@@ -2137,7 +2137,7 @@ index 06f7c50ce77f..09ed686ac5e6 100644
  #else /* CONFIG_SECURITY */
 
  static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1347,6 +1348,10 @@ static inline int security_locked_down(enum lockdown_reason what)
+@@ -1348,6 +1349,10 @@ static inline int security_locked_down(enum lockdown_reason what)
  {
  	return 0;
  }
@@ -2323,10 +2323,10 @@ index 87cbdc64d272..18555cf18da7 100644
 
  static int __init lockdown_lsm_init(void)
 diff --git a/security/security.c b/security/security.c
-index b38155b2de83..b0a6711b4825 100644
+index 0d626c0dafcc..61696b1f5d3f 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -2598,6 +2598,12 @@ int security_locked_down(enum lockdown_reason what)
+@@ -2599,6 +2599,12 @@ int security_locked_down(enum lockdown_reason what)
  }
  EXPORT_SYMBOL(security_locked_down);
 
diff --git a/sources b/sources
index e0eb571d8..bf1ee24de 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13.10.tar.xz) = 54dff92c44f689996568b1a0e73489592340dda4ca1e4ec2113ecce53d09ac92db39db033641ee57268d893091bfc839fc7ba6df05f8adee53604fbc4423833f
-SHA512 (kernel-abi-whitelists-5.13.10-200.tar.bz2) = 4e5f2d12d74001a898bcb8f546e424c61c064808bacdfbabf77d4730d0d8ab990b2754e7920bf5f9c3c10c3f3b9ee9e7d5ff2a473b0070fc160ae66c32547372
-SHA512 (kernel-kabi-dw-5.13.10-200.tar.bz2) = 3b629d300a3a346f29d9de17e89b1b4cf30d968e26071e8cdb84f0c7c6ce8a80a25f3665ddd0e844afe4bfc08ece86c93b3044c83494c2b4d1b5505105973164
+SHA512 (linux-5.13.11.tar.xz) = 9dcf29f211806e4967d5de948eeb3b6750cd8ca86d08f5c79dd56921a5896e04d3e9ebba3f281810e7180833b92939e78047bb21c3327dbdcadd3a0df24084e3
+SHA512 (kernel-abi-whitelists-5.13.11-200.tar.bz2) = df849e98c481632777cb7058bf9db98c993ab7bce7f5d08d07d3ef0d03999ad810c238b192900b1de9cbd1a2ac61d9f76abdb4c64836dfd0a7b65696fcc254b5
+SHA512 (kernel-kabi-dw-5.13.11-200.tar.bz2) = ff2c0fc2ea35f347c6b0c2456305b415255332c3fa60d61c700cc6e02823cf12f9bfca1698b0d4700e7423869ff3653891f42c22097a489381ca0367599e7f57