From d974843d6b32e3957d890b22061e4a2f01094ca9 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 20 Oct 2021 10:51:34 -0500 Subject: kernel-5.14.14-0 * Wed Oct 20 2021 Justin M. Forbes [5.14.14-0] - autofs: fix wait name hash calculation in autofs_wait() (Ian Kent) - Fix up quirk to match upstream (Justin M. Forbes) - Re-enable CONFIG_RDMA_RXE for Fedora (Justin M. Forbes) - Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes) - Fix changelog missing entries (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 9 ++++++ kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 1 + kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 15 +++++++--- patch-5.14-redhat.patch | 56 ++++++++++++++++++-------------------- sources | 6 ++-- 16 files changed, 61 insertions(+), 47 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index d63fe369a..1a2233947 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,12 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/c72074b04c2b97c40f0fecb2754cd58f83c21642 + c72074b04c2b97c40f0fecb2754cd58f83c21642 autofs: fix wait name hash calculation in autofs_wait() + +https://gitlab.com/cki-project/kernel-ark/-/commit/cf1b4a61d08376edbf118eaadd3917b1feb96dac + cf1b4a61d08376edbf118eaadd3917b1feb96dac Fix up quirk to match upstream + +https://gitlab.com/cki-project/kernel-ark/-/commit/959b672c6338f5fa203aadc5cd121c724ea2a002 + 959b672c6338f5fa203aadc5cd121c724ea2a002 Fix up backport of Dell XPS 9710 quirk + https://gitlab.com/cki-project/kernel-ark/-/commit/7669a9b770057fa6a97e4fc23225e72ddba8719d 7669a9b770057fa6a97e4fc23225e72ddba8719d ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index cf936535e..1f44782bc 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5598,7 +5598,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set # CONFIG_RDS is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 274b439c7..c8dd1a9f5 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4407,6 +4407,7 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y # CONFIG_QCOM_QFPROM is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPMH is not set +CONFIG_QCOM_SCM=y # CONFIG_QCOM_SMEM is not set # CONFIG_QCOM_SPMI_IADC is not set # CONFIG_QCOM_SPMI_VADC is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index dbb913ce0..2c3dca1fb 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5575,7 +5575,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set # CONFIG_RDS is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 3ef66f4fc..ed9a9400a 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4386,6 +4386,7 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y # CONFIG_QCOM_QFPROM is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPMH is not set +CONFIG_QCOM_SCM=y # CONFIG_QCOM_SMEM is not set # CONFIG_QCOM_SPMI_IADC is not set # CONFIG_QCOM_SPMI_VADC is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index a4c2e2a16..a98887848 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5039,7 +5039,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 2158fc190..a9267c4f5 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5017,7 +5017,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 34323c2ec..6e192bfc1 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4722,7 +4722,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index b044d5937..1d6d5e724 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4699,7 +4699,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 23eb05f75..4b3161501 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4663,7 +4663,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 5c4fc12d7..35ae38330 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4640,7 +4640,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 302e2ceff..33e0575be 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5082,7 +5082,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 2cd077ae3..82904e08e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5060,7 +5060,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m diff --git a/kernel.spec b/kernel.spec index 68e213c35..2f0a03600 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.13 +%define rpmversion 5.14.14 %define patchversion 5.14 %define pkgrelease 100 @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.13.tar.xz +Source0: linux-5.14.14.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.13 -c -mv linux-5.14.13 linux-%{KVERREL} +%setup -q -n kernel-5.14.14 -c +mv linux-5.14.14 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2958,6 +2958,13 @@ fi # # %changelog +* Wed Oct 20 2021 Justin M. Forbes [5.14.14-0] +- autofs: fix wait name hash calculation in autofs_wait() (Ian Kent) +- Fix up quirk to match upstream (Justin M. Forbes) +- Re-enable CONFIG_RDMA_RXE for Fedora (Justin M. Forbes) +- Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes) +- Fix changelog missing entries (Justin M. Forbes) + * Sun Oct 17 2021 Justin M. Forbes [5.14.13-0] - ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart) diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch index c9982dc31..4d03990a1 100644 --- a/patch-5.14-redhat.patch +++ b/patch-5.14-redhat.patch @@ -28,6 +28,7 @@ drivers/net/wireguard/main.c | 6 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + + fs/autofs/waitq.c | 2 +- fs/xfs/xfs_super.c | 8 - include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + @@ -42,7 +43,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - sound/soc/intel/boards/sof_sdw.c | 12 + + sound/soc/intel/boards/sof_sdw.c | 13 + tools/testing/selftests/bpf/Makefile | 1 - .../selftests/bpf/prog_tests/linked_funcs.c | 42 -- .../testing/selftests/bpf/prog_tests/linked_maps.c | 30 -- @@ -56,7 +57,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, 721 insertions(+), 1510 deletions(-) + 59 files changed, 723 insertions(+), 1511 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2fb7012c3246..47718b4f2f75 100644 @@ -1488,6 +1489,19 @@ index 86658a81d284..5647f4756e97 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/fs/autofs/waitq.c b/fs/autofs/waitq.c +index 16b5fca0626e..54c1f8b8b075 100644 +--- a/fs/autofs/waitq.c ++++ b/fs/autofs/waitq.c +@@ -358,7 +358,7 @@ int autofs_wait(struct autofs_sb_info *sbi, + qstr.len = strlen(p); + offset = p - name; + } +- qstr.hash = full_name_hash(dentry, name, qstr.len); ++ qstr.hash = full_name_hash(dentry, qstr.name, qstr.len); + + if (mutex_lock_interruptible(&sbi->wq_mutex)) { + kfree(name); diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 2c9e26a44546..f96324912d6a 100644 --- a/fs/xfs/xfs_super.c @@ -1812,10 +1826,18 @@ index 9ffa9e9c5c55..36484cc9842d 100644 int security_perf_event_open(struct perf_event_attr *attr, int type) { diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c -index cb3afc4519cf..6a12f9817e0b 100644 +index cb3afc4519cf..a8a0156045ba 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c -@@ -128,6 +128,18 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { +@@ -13,6 +13,7 @@ + #include + #include + #include "sof_sdw_common.h" ++#include "../../codecs/rt711.h" + + unsigned long sof_sdw_quirk = SOF_RT711_JD_SRC_JD1; + static int quirk_override = -1; +@@ -128,6 +129,18 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { SOF_RT711_JD_SRC_JD2 | SOF_RT715_DAI_ID_FIX), }, @@ -3222,29 +3244,3 @@ index e4f5bd388a3c..000000000000 -} - -char LICENSE[] SEC("license") = "GPL"; -From 53c4c6b56f335cb97de78ede2e2f65c5ff90df2c Mon Sep 17 00:00:00 2001 -From: "Justin M. Forbes" -Date: Tue, 10 Aug 2021 13:34:24 -0500 -Subject: [PATCH] Fix up backport of Dell XPS 9710 quirk - -Signed-off-by: Justin M. Forbes ---- - sound/soc/intel/boards/sof_sdw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c -index c78a98be343d..3635d8002ecf 100644 ---- a/sound/soc/intel/boards/sof_sdw.c -+++ b/sound/soc/intel/boards/sof_sdw.c -@@ -136,7 +136,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { - DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5D") - }, - .driver_data = (void *)(SOF_SDW_TGL_HDMI | -- RT711_JD2 | -+ SOF_RT711_JD_SRC_JD2 | - SOF_RT715_DAI_ID_FIX | - SOF_SDW_FOUR_SPK), - }, --- -2.31.1 - diff --git a/sources b/sources index 28b635520..556701aa0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.19-100.tar.bz2) = aa42434b67960da00ae8b389c26ff8656a0e28af0e8650ad54b84d8dbaaf80a2878fda332ce42d82c032035c2ea86410087d67a242e4802e90e1b9c21701e32d -SHA512 (linux-5.14.13.tar.xz) = 94bf4282b863439b1ec4a900e404142abc08b1b8085356b74352b09ab7ddd708f357b3d3c3f29d9ff3fbe7d4fb6529d699d84ff1e8b43df09b8f643b058c7d51 -SHA512 (kernel-abi-stablelists-5.14.13-100.tar.bz2) = 8adccbf224405ce98f5889222c5069d38a20da65105820ca1a315860a5375f514d823f2df388ae276503474261bdbc57a0aca84e7b518985ac9f3646150c8df5 -SHA512 (kernel-kabi-dw-5.14.13-100.tar.bz2) = e18e0183c6ea2a8bf968721d22cf609cfbdb47e4a026355aa4ad5c1902debe4d23a1da1684984589a31dda28d96f890a50f1d8c1e772f263e5023faa5a821bed +SHA512 (linux-5.14.14.tar.xz) = 4bccd5b2e1342e317582a30a564731ef17d60fd5be50bc8be7e3bfda93a25870b8cad23664987e69089b006f91ae5787eabcba127bdd0fad01fe84012da4f537 +SHA512 (kernel-abi-stablelists-5.14.14-100.tar.bz2) = 6825a78768948a3cd3f1d03b6245ca901dfaa04e52ce3c358702b900af0de5a55a285707b9e32b8c0cf165d34bc16f0f59b6d7e50cbb11e5cefa5a94cce2ac9f +SHA512 (kernel-kabi-dw-5.14.14-100.tar.bz2) = d48fcc19c223797c99187a800001f618df4946e639ed2a48ced3a7f7e27e38e9625f0ed04955bc30f6227ec91998e725bc290790ec5e5d8d99ef22f16a3593ac -- cgit