From a059247f2404be63e260e81cb8d757610c7f5d30 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Nov 18 2021 22:07:01 +0000 Subject: kernel-5.15-0 * Thu Nov 18 2021 Justin M. Forbes [5.15-0] - Enable CIFS_SMB_DIRECT for Fedora (Justin M. Forbes) - Fedora: rockchip: move the GPIO module back to builtin (Peter Robinson) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index f7bf564..151a9d7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1064,7 +1064,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y @@ -2434,7 +2434,7 @@ CONFIG_GPIO_PCI_IDIO_16=m CONFIG_GPIO_PL061=y CONFIG_GPIO_RASPBERRYPI_EXP=m # CONFIG_GPIO_RDC321X is not set -CONFIG_GPIO_ROCKCHIP=m +CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 69e899c..896adf8 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1064,7 +1064,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y @@ -2418,7 +2418,7 @@ CONFIG_GPIO_PCI_IDIO_16=m CONFIG_GPIO_PL061=y CONFIG_GPIO_RASPBERRYPI_EXP=m # CONFIG_GPIO_RDC321X is not set -CONFIG_GPIO_ROCKCHIP=m +CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 44d6462..f5c73a8 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1088,7 +1088,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y @@ -2455,7 +2455,7 @@ CONFIG_GPIO_PISOSR=m CONFIG_GPIO_PL061=y CONFIG_GPIO_RASPBERRYPI_EXP=m # CONFIG_GPIO_RDC321X is not set -CONFIG_GPIO_ROCKCHIP=m +CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 89cf46b..2eee540 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1088,7 +1088,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y @@ -2440,7 +2440,7 @@ CONFIG_GPIO_PISOSR=m CONFIG_GPIO_PL061=y CONFIG_GPIO_RASPBERRYPI_EXP=m # CONFIG_GPIO_RDC321X is not set -CONFIG_GPIO_ROCKCHIP=m +CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 483b846..420079c 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1062,7 +1062,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y @@ -2405,7 +2405,7 @@ CONFIG_GPIO_PISOSR=m CONFIG_GPIO_PL061=y CONFIG_GPIO_RASPBERRYPI_EXP=m # CONFIG_GPIO_RDC321X is not set -CONFIG_GPIO_ROCKCHIP=m +CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 2ed2408..510f822 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1062,7 +1062,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y @@ -2390,7 +2390,7 @@ CONFIG_GPIO_PISOSR=m CONFIG_GPIO_PL061=y CONFIG_GPIO_RASPBERRYPI_EXP=m # CONFIG_GPIO_RDC321X is not set -CONFIG_GPIO_ROCKCHIP=m +CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SIFIVE is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 574ab7b..cfa39de 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -886,7 +886,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 2ebe94c..4860144 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -885,7 +885,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index fdf903e..da70ceb 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -839,7 +839,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 4d2e453..d9c73ae 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -838,7 +838,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index b6b74b3..f2482c9 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -846,7 +846,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 32abbb3..279ea43 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -845,7 +845,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5db60b7..19a2a66 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -897,7 +897,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3d2b7df..8df3e3e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -896,7 +896,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_SWN_UPCALL=y CONFIG_CIFS_UPCALL=y diff --git a/kernel.spec b/kernel.spec index 7ee9427..6733e8f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -128,7 +128,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.15 -%define rpmversion 5.15.2 +%define rpmversion 5.15.3 %define patchversion 5.15 %define pkgrelease 200 @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15.2.tar.xz +Source0: linux-5.15.3.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15.2 -c -mv linux-5.15.2 linux-%{KVERREL} +%setup -q -n kernel-5.15.3 -c +mv linux-5.15.3 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2972,6 +2972,10 @@ fi # # %changelog +* Thu Nov 18 2021 Justin M. Forbes [5.15-0] +- Enable CIFS_SMB_DIRECT for Fedora (Justin M. Forbes) +- Fedora: rockchip: move the GPIO module back to builtin (Peter Robinson) + * Fri Nov 12 2021 Justin M. Forbes [5.15-0] - usb: xhci: tegra: Check padctrl interrupt presence in device tree (Dmitry Osipenko) - Fedora: Enable MediaTek bluetooth pieces (Peter Robinson) diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 49f5349..3a88d2f 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -26,7 +26,6 @@ drivers/hid/hid-rmi.c | 64 ----------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- - drivers/input/serio/i8042-x86ia64io.h | 14 +++ drivers/iommu/iommu.c | 22 ++++ drivers/nvme/host/core.c | 22 +++- drivers/nvme/host/multipath.c | 19 ++-- @@ -48,10 +47,10 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 50 files changed, 805 insertions(+), 214 deletions(-) + 49 files changed, 791 insertions(+), 214 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 43dc35fe5bc0..07f1615206d4 100644 +index 1396fd2d9031..4bc97128cee8 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3949,6 +3949,15 @@ @@ -71,7 +70,7 @@ index 43dc35fe5bc0..07f1615206d4 100644 This is normally done in pci_enable_device(), so this option is a temporary workaround diff --git a/Makefile b/Makefile -index 14480187ac75..b3146bb9a64f 100644 +index 79eeb13c0973..084fdfae9d16 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -584,7 +583,7 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 5b54c80b9d32..86c314f8d8a0 100644 +index 770b82483d74..1b922c6b79d6 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1720,6 +1720,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -659,7 +658,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index e96cb5c4f97a..d645460fe8a9 100644 +index a08f53f208bf..49942737cae0 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -670,7 +669,7 @@ index e96cb5c4f97a..d645460fe8a9 100644 #include #define IPMI_DRIVER_VERSION "39.2" -@@ -5160,8 +5161,21 @@ static int __init ipmi_init_msghandler_mod(void) +@@ -5164,8 +5165,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; @@ -1420,38 +1419,6 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ -diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index a5a003553646..aedd05541044 100644 ---- a/drivers/input/serio/i8042-x86ia64io.h -+++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -272,6 +272,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S6230"), - }, - }, -+ { -+ /* Fujitsu Lifebook T725 laptop */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), -+ }, -+ }, - { - /* Fujitsu Lifebook U745 */ - .matches = { -@@ -840,6 +847,13 @@ static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK AH544"), - }, - }, -+ { -+ /* Fujitsu Lifebook T725 laptop */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), -+ }, -+ }, - { - /* Fujitsu U574 laptop */ - /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 3303d707bab4..372edaaafaa1 100644 --- a/drivers/iommu/iommu.c @@ -1560,7 +1527,7 @@ index f8dd664b2eda..0ff9ea8340e4 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index fba06618c6c2..a4d81de29e13 100644 +index 2f76969408b2..021a4176b321 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) @@ -1596,7 +1563,7 @@ index fba06618c6c2..a4d81de29e13 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) -@@ -814,8 +820,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -813,8 +819,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1629,10 +1596,10 @@ index ed79a6c7e804..961dc67d7261 100644 { } diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 4537d1ea14fd..af30ab6c81e2 100644 +index 6c957124f84d..28e3040eae66 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4268,6 +4268,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4269,6 +4269,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); diff --git a/sources b/sources index a3687ac..3e06ea2 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 -SHA512 (linux-5.15.2.tar.xz) = 9256a57aee3fb226b0994f593bbb8e781a55706eb358d979394cf35ebf899dfe5a1b14cfc0b06ac968aa0730d9283b19543f5ea3e07e4e3575ceda71d48f862c -SHA512 (kernel-abi-stablelists-5.15.2-200.tar.bz2) = 134b3229c353ca90d225b29fd09c68817424f4e5dc9fa152d21778ca79e09e12e5c90c3c9607bb8075ef3da1788059e727c639f5609eea02901a00e8fc04716b -SHA512 (kernel-kabi-dw-5.15.2-200.tar.bz2) = 01afcac40bbbd02099677133aa803945e7d9f57d9d98d66d0831573156faa5aec1571a6b5e25b0b03c2ad055bbbed0e13618677c426e61d46e73ee42036308be +SHA512 (linux-5.15.3.tar.xz) = e2994aa4e145cdf24b5ed2e92116179eb1ba913792e0351bfc696e289300f84723b59e52c6d74440aa92c771c1b0a330cd8b2767df7da78a8fc3a2b072bac842 +SHA512 (kernel-abi-stablelists-5.15.3-200.tar.bz2) = 65e5541bdc9d31b11502c7399e37d3af52f8bdcb7e43f5d0a1cee06b606fd7d4cc44318a4d07dfafdad0f93083ffb37dc625e08f74f4f86238dac6fbf4923eda +SHA512 (kernel-kabi-dw-5.15.3-200.tar.bz2) = aeacdb6f576fda64c2bdb3110603f25e71129d85edf95a64266ea4acf325dd8ab69f98691e73a93bb9edcc454b291f4b4a96519be5a649f3c2c4ffe3ea87a9bb