diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-19 18:47:06 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-19 18:47:06 +0200 |
commit | 872a8b5456d3a256ad0ecc3990dd5b343b9802bd (patch) | |
tree | b6a8040af246620634cb1857f2f2b76352190757 | |
parent | 913a4186100fcc44e2d9b784cf61deb424f93b50 (diff) | |
parent | eae9406c3d327f2bab6fffc82adccb47584e1ebf (diff) | |
download | kernel-872a8b5456d3a256ad0ecc3990dd5b343b9802bd.tar.gz kernel-872a8b5456d3a256ad0ecc3990dd5b343b9802bd.tar.xz kernel-872a8b5456d3a256ad0ecc3990dd5b343b9802bd.zip |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
-rwxr-xr-x | kernel.spec | 31 | ||||
-rw-r--r-- | patch-5.13-redhat.patch | 71 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 34 insertions, 74 deletions
diff --git a/kernel.spec b/kernel.spec index 3fe6ab5b8..868a99768 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2891,9 +2891,36 @@ fi # # %changelog -* Tue Aug 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.11-200] -- kernel-5.13.11-0 (Justin M. Forbes) +* Wed Aug 18 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.12-200] +- kernel-5.13.12-0 (Justin M. Forbes) + +* Tue Aug 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.11-0] - bpf: Fix integer overflow involving bucket_size (Tatsuhiko Yasumatsu) +- kernel-5.13.10-0 (Justin M. Forbes) +- 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) * 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) diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch index d25c40da5..827231693 100644 --- a/patch-5.13-redhat.patch +++ b/patch-5.13-redhat.patch @@ -31,7 +31,6 @@ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + drivers/nvme/host/pci.c | 28 +- drivers/pci/quirks.c | 24 + - drivers/pinctrl/intel/pinctrl-tigerlake.c | 26 +- drivers/platform/x86/amd-pmc.c | 204 +++++++- drivers/scsi/smartpqi/smartpqi_init.c | 16 + drivers/usb/core/hub.c | 7 + @@ -42,7 +41,6 @@ include/linux/rmi.h | 1 + include/linux/security.h | 5 + init/Kconfig | 2 +- - kernel/bpf/hashtab.c | 4 +- kernel/crash_core.c | 28 +- kernel/module_signing.c | 9 +- security/integrity/platform_certs/load_uefi.c | 6 +- @@ -74,7 +72,7 @@ tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- .../selftests/bpf/progs/test_static_linked1.c | 30 -- .../selftests/bpf/progs/test_static_linked2.c | 31 -- - 76 files changed, 957 insertions(+), 2366 deletions(-) + 74 files changed, 942 insertions(+), 2351 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -99,7 +97,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index eaf1df54ad12..96c289777a99 100644 +index 2458a4abcbcc..93ddceb5d254 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1541,56 +1539,6 @@ index 6d74386eadc2..2333c1e4ae05 100644 /* * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. -diff --git a/drivers/pinctrl/intel/pinctrl-tigerlake.c b/drivers/pinctrl/intel/pinctrl-tigerlake.c -index 75b6d66955bf..3ddaeffc0415 100644 ---- a/drivers/pinctrl/intel/pinctrl-tigerlake.c -+++ b/drivers/pinctrl/intel/pinctrl-tigerlake.c -@@ -701,32 +701,32 @@ static const struct pinctrl_pin_desc tglh_pins[] = { - - static const struct intel_padgroup tglh_community0_gpps[] = { - TGL_GPP(0, 0, 24, 0), /* GPP_A */ -- TGL_GPP(1, 25, 44, 128), /* GPP_R */ -- TGL_GPP(2, 45, 70, 32), /* GPP_B */ -- TGL_GPP(3, 71, 78, INTEL_GPIO_BASE_NOMAP), /* vGPIO_0 */ -+ TGL_GPP(1, 25, 44, 32), /* GPP_R */ -+ TGL_GPP(2, 45, 70, 64), /* GPP_B */ -+ TGL_GPP(3, 71, 78, 96), /* vGPIO_0 */ - }; - - static const struct intel_padgroup tglh_community1_gpps[] = { -- TGL_GPP(0, 79, 104, 96), /* GPP_D */ -- TGL_GPP(1, 105, 128, 64), /* GPP_C */ -- TGL_GPP(2, 129, 136, 160), /* GPP_S */ -- TGL_GPP(3, 137, 153, 192), /* GPP_G */ -- TGL_GPP(4, 154, 180, 224), /* vGPIO */ -+ TGL_GPP(0, 79, 104, 128), /* GPP_D */ -+ TGL_GPP(1, 105, 128, 160), /* GPP_C */ -+ TGL_GPP(2, 129, 136, 192), /* GPP_S */ -+ TGL_GPP(3, 137, 153, 224), /* GPP_G */ -+ TGL_GPP(4, 154, 180, 256), /* vGPIO */ - }; - - static const struct intel_padgroup tglh_community3_gpps[] = { -- TGL_GPP(0, 181, 193, 256), /* GPP_E */ -- TGL_GPP(1, 194, 217, 288), /* GPP_F */ -+ TGL_GPP(0, 181, 193, 288), /* GPP_E */ -+ TGL_GPP(1, 194, 217, 320), /* GPP_F */ - }; - - static const struct intel_padgroup tglh_community4_gpps[] = { -- TGL_GPP(0, 218, 241, 320), /* GPP_H */ -+ TGL_GPP(0, 218, 241, 352), /* GPP_H */ - TGL_GPP(1, 242, 251, 384), /* GPP_J */ -- TGL_GPP(2, 252, 266, 352), /* GPP_K */ -+ TGL_GPP(2, 252, 266, 416), /* GPP_K */ - }; - - static const struct intel_padgroup tglh_community5_gpps[] = { -- TGL_GPP(0, 267, 281, 416), /* GPP_I */ -+ TGL_GPP(0, 267, 281, 448), /* GPP_I */ - TGL_GPP(1, 282, 290, INTEL_GPIO_BASE_NOMAP), /* JTAG */ - }; - diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index ca95c2a52e26..e38e8288468f 100644 --- a/drivers/platform/x86/amd-pmc.c @@ -2161,21 +2109,6 @@ index a61c92066c2e..94107b1d0e3e 100644 select IO_WQ default y help -diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c -index d7ebb12ffffc..49857e8cd6ce 100644 ---- a/kernel/bpf/hashtab.c -+++ b/kernel/bpf/hashtab.c -@@ -1464,8 +1464,8 @@ __htab_map_lookup_and_delete_batch(struct bpf_map *map, - /* We cannot do copy_from_user or copy_to_user inside - * the rcu_read_lock. Allocate enough space here. - */ -- keys = kvmalloc(key_size * bucket_size, GFP_USER | __GFP_NOWARN); -- values = kvmalloc(value_size * bucket_size, GFP_USER | __GFP_NOWARN); -+ keys = kvmalloc_array(key_size, bucket_size, GFP_USER | __GFP_NOWARN); -+ values = kvmalloc_array(value_size, bucket_size, GFP_USER | __GFP_NOWARN); - if (!keys || !values) { - ret = -ENOMEM; - goto after_loop; diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 684a6061a13a..220579c0e963 100644 --- a/kernel/crash_core.c @@ -1,3 +1,3 @@ -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 +SHA512 (linux-5.13.12.tar.xz) = faf3845a0a6e3c34c6562487ac330d81a3cfc117a1efb667fd6703b8a716e92e95ee1525920d28c75d5c4d1533a72c8e3cc8a91da21ceceb47ca5167cc203466 +SHA512 (kernel-abi-whitelists-5.13.12-200.tar.bz2) = 2a2cdbe67e05cc07099c2226877f06ad52e299d582c7979fceae19426575d61a4d6e2140634fc192d756c18b0524fada9dfd9011c8ebd53b1a6cb6f394681367 +SHA512 (kernel-kabi-dw-5.13.12-200.tar.bz2) = 783a284a0f95343a11164ed3e4457a0af12ca54b2ef0b386c927b5a9b656a4a45169509f273a395e9d27dfc0ab46744e1e3e821a1deb2d69191840cc2bc7a085 |