diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-04-08 09:19:37 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-04-08 09:19:37 -0500 |
commit | 815f6416d41e445ace8dd1c212f4e3c1032f7d45 (patch) | |
tree | 045aedb2b15619cd36b9159165f52d1c6833f2fd /patch-5.17-redhat.patch | |
parent | 8db3d1f47fd8f9dfa6c83e5e6c20dde1109899cf (diff) | |
download | kernel-815f6416d41e445ace8dd1c212f4e3c1032f7d45.tar.gz kernel-815f6416d41e445ace8dd1c212f4e3c1032f7d45.tar.xz kernel-815f6416d41e445ace8dd1c212f4e3c1032f7d45.zip |
kernel-5.17.2-0
* Fri Apr 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.2-0]
- Move the patch to the redhat directory so it doesn't end up as an applied patch (Justin M. Forbes)
- Config updates for 5.17.2 (Justin M. Forbes)
- Fedora: arm: Updates for QCom devices (Peter Robinson)
- Fedora arm and generic updates for 5.17 (Peter Robinson)
- enable COMMON_CLK_SI5341 for Xilinx ZYNQ-MP (Peter Robinson)
- Update Fix 'mem_section' will never be NULL gcc 12 warning to V4 (Justin M. Forbes)
- NFSv4.1 provide mount option to toggle trunking discovery (Olga Kornievskaia)
- Add the Revert patch so that it can be applied when building dist-git for F34 and F35 (Justin M. Forbes)
- redhat/configs/process_configs.sh: Avoid race with find (Prarit Bhargava)
- redhat/configs/process_configs.sh: Remove CONTINUEONERROR (Prarit Bhargava)
- redhat/configs/process_configs.sh: Fix race with tools generation (Prarit Bhargava)
- Bluetooth: hci_core: Rate limit the logging of invalid SCO handle (Luiz Augusto von Dentz)
- Bluetooth: hci_event: Fix HCI_EV_VENDOR max_len (Luiz Augusto von Dentz)
- Update mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 (Justin M. Forbes)
- net: bcmgenet: Use stronger register read/writes to assure ordering (Jeremy Linton)
- We actually needed the previous patch from os-build (Justin M. Forbes)
- redhat: Fix release tagging (Prarit Bhargava)
- Fix up changelog generation for stable releases (Justin M. Forbes)
- Remove i686 configs and filters (Justin M. Forbes)
- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
- redhat/configs: Set CONFIG_X86_AMD_PSTATE built-in on Fedora (Prarit Bhargava)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.17-redhat.patch')
-rw-r--r-- | patch-5.17-redhat.patch | 232 |
1 files changed, 25 insertions, 207 deletions
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index ed4ed974f..05acb8d59 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -1,4 +1,3 @@ - 0001-Revert-SimpleDRM-changes.patch | 108 ++++++++++++++++++ Documentation/core-api/dma-attributes.rst | 8 ++ Kconfig | 2 + Kconfig.redhat | 17 +++ @@ -25,7 +24,6 @@ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/iommu/iommu.c | 22 ++++ - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- drivers/nvme/host/core.c | 22 +++- drivers/nvme/host/multipath.c | 19 ++-- drivers/nvme/host/nvme.h | 4 + @@ -45,133 +43,18 @@ include/linux/rmi.h | 1 + include/linux/security.h | 5 + init/Kconfig | 2 +- - kernel/dma/swiotlb.c | 23 ++-- + kernel/dma/swiotlb.c | 12 +- kernel/module.c | 2 + kernel/module_signing.c | 9 +- net/bluetooth/hci_core.c | 4 +- - net/bluetooth/hci_event.c | 7 +- scripts/mod/modpost.c | 8 ++ scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 58 files changed, 885 insertions(+), 223 deletions(-) + 55 files changed, 767 insertions(+), 211 deletions(-) -diff --git a/0001-Revert-SimpleDRM-changes.patch b/0001-Revert-SimpleDRM-changes.patch -new file mode 100644 -index 000000000000..5b63b49da946 ---- /dev/null -+++ b/0001-Revert-SimpleDRM-changes.patch -@@ -0,0 +1,108 @@ -+From 71e9b84904d2dffca453acc8e44029197bd7057d Mon Sep 17 00:00:00 2001 -+From: "Justin M. Forbes" <jforbes@fedoraproject.org> -+Date: Thu, 31 Mar 2022 13:42:18 -0500 -+Subject: [PATCH] Revert SimpleDRM changes -+ -+The Simple DRM feature for F36 requires some configration changes that -+do not work for everyone on F35 and below. This revert will be saved in -+the tree so that it can be applied before building configs for F34/F35 -+ -+Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> -+--- -+ redhat/configs/fedora/generic/CONFIG_DRM | 1 - -+ redhat/configs/fedora/generic/CONFIG_DRM_DEBUG_MM | 1 - -+ redhat/configs/fedora/generic/CONFIG_DRM_SIMPLEDRM | 2 +- -+ redhat/configs/fedora/generic/CONFIG_FB_EFI | 1 - -+ redhat/configs/fedora/generic/CONFIG_FB_SSD1307 | 2 +- -+ redhat/configs/fedora/generic/CONFIG_I2C_ALGOBIT | 1 - -+ redhat/configs/fedora/generic/CONFIG_SYSFB_SIMPLEFB | 2 +- -+ redhat/configs/fedora/generic/arm/CONFIG_FB_SIMPLE | 2 +- -+ redhat/configs/fedora/generic/arm/CONFIG_FB_SSD1307 | 2 +- -+ redhat/configs/fedora/generic/x86/CONFIG_FB_I810 | 2 +- -+ redhat/configs/fedora/generic/x86/CONFIG_FB_VGA16 | 2 +- -+ 11 files changed, 7 insertions(+), 11 deletions(-) -+ delete mode 100644 redhat/configs/fedora/generic/CONFIG_DRM -+ delete mode 100644 redhat/configs/fedora/generic/CONFIG_DRM_DEBUG_MM -+ delete mode 100644 redhat/configs/fedora/generic/CONFIG_FB_EFI -+ delete mode 100644 redhat/configs/fedora/generic/CONFIG_I2C_ALGOBIT -+ -+diff --git a/redhat/configs/fedora/generic/CONFIG_DRM b/redhat/configs/fedora/generic/CONFIG_DRM -+deleted file mode 100644 -+index 517f31840d34..000000000000 -+--- a/redhat/configs/fedora/generic/CONFIG_DRM -++++ /dev/null -+@@ -1 +0,0 @@ -+-CONFIG_DRM=y -+diff --git a/redhat/configs/fedora/generic/CONFIG_DRM_DEBUG_MM b/redhat/configs/fedora/generic/CONFIG_DRM_DEBUG_MM -+deleted file mode 100644 -+index 117f02c9e72a..000000000000 -+--- a/redhat/configs/fedora/generic/CONFIG_DRM_DEBUG_MM -++++ /dev/null -+@@ -1 +0,0 @@ -+-# CONFIG_DRM_DEBUG_MM is not set -+diff --git a/redhat/configs/fedora/generic/CONFIG_DRM_SIMPLEDRM b/redhat/configs/fedora/generic/CONFIG_DRM_SIMPLEDRM -+index b81ed1176cd9..2bd12280c074 100644 -+--- a/redhat/configs/fedora/generic/CONFIG_DRM_SIMPLEDRM -++++ b/redhat/configs/fedora/generic/CONFIG_DRM_SIMPLEDRM -+@@ -1 +1 @@ -+-CONFIG_DRM_SIMPLEDRM=y -++# CONFIG_DRM_SIMPLEDRM is not set -+diff --git a/redhat/configs/fedora/generic/CONFIG_FB_EFI b/redhat/configs/fedora/generic/CONFIG_FB_EFI -+deleted file mode 100644 -+index 93d6a277972b..000000000000 -+--- a/redhat/configs/fedora/generic/CONFIG_FB_EFI -++++ /dev/null -+@@ -1 +0,0 @@ -+-# CONFIG_FB_EFI is not set -+diff --git a/redhat/configs/fedora/generic/CONFIG_FB_SSD1307 b/redhat/configs/fedora/generic/CONFIG_FB_SSD1307 -+index cddd16bb7398..efd995bdfe8a 100644 -+--- a/redhat/configs/fedora/generic/CONFIG_FB_SSD1307 -++++ b/redhat/configs/fedora/generic/CONFIG_FB_SSD1307 -+@@ -1 +1 @@ -+-# CONFIG_FB_SSD1307 is not set -++CONFIG_FB_SSD1307=m -+diff --git a/redhat/configs/fedora/generic/CONFIG_I2C_ALGOBIT b/redhat/configs/fedora/generic/CONFIG_I2C_ALGOBIT -+deleted file mode 100644 -+index b89d18d43501..000000000000 -+--- a/redhat/configs/fedora/generic/CONFIG_I2C_ALGOBIT -++++ /dev/null -+@@ -1 +0,0 @@ -+-CONFIG_I2C_ALGOBIT=y -+diff --git a/redhat/configs/fedora/generic/CONFIG_SYSFB_SIMPLEFB b/redhat/configs/fedora/generic/CONFIG_SYSFB_SIMPLEFB -+index d542137dbb6a..6ae3e10a489e 100644 -+--- a/redhat/configs/fedora/generic/CONFIG_SYSFB_SIMPLEFB -++++ b/redhat/configs/fedora/generic/CONFIG_SYSFB_SIMPLEFB -+@@ -1 +1 @@ -+-CONFIG_SYSFB_SIMPLEFB=y -++# CONFIG_SYSFB_SIMPLEFB is not set -+diff --git a/redhat/configs/fedora/generic/arm/CONFIG_FB_SIMPLE b/redhat/configs/fedora/generic/arm/CONFIG_FB_SIMPLE -+index 3ae9be22cdf9..0eb3d04225f1 100644 -+--- a/redhat/configs/fedora/generic/arm/CONFIG_FB_SIMPLE -++++ b/redhat/configs/fedora/generic/arm/CONFIG_FB_SIMPLE -+@@ -1 +1 @@ -+-# CONFIG_FB_SIMPLE is not set -++CONFIG_FB_SIMPLE=y -+diff --git a/redhat/configs/fedora/generic/arm/CONFIG_FB_SSD1307 b/redhat/configs/fedora/generic/arm/CONFIG_FB_SSD1307 -+index cddd16bb7398..efd995bdfe8a 100644 -+--- a/redhat/configs/fedora/generic/arm/CONFIG_FB_SSD1307 -++++ b/redhat/configs/fedora/generic/arm/CONFIG_FB_SSD1307 -+@@ -1 +1 @@ -+-# CONFIG_FB_SSD1307 is not set -++CONFIG_FB_SSD1307=m -+diff --git a/redhat/configs/fedora/generic/x86/CONFIG_FB_I810 b/redhat/configs/fedora/generic/x86/CONFIG_FB_I810 -+index 3a3f4d26de7b..9ef6eca18a0a 100644 -+--- a/redhat/configs/fedora/generic/x86/CONFIG_FB_I810 -++++ b/redhat/configs/fedora/generic/x86/CONFIG_FB_I810 -+@@ -1 +1 @@ -+-# CONFIG_FB_I810 is not set -++CONFIG_FB_I810=m -+diff --git a/redhat/configs/fedora/generic/x86/CONFIG_FB_VGA16 b/redhat/configs/fedora/generic/x86/CONFIG_FB_VGA16 -+index d933f13d7a84..4fa33dfdc6be 100644 -+--- a/redhat/configs/fedora/generic/x86/CONFIG_FB_VGA16 -++++ b/redhat/configs/fedora/generic/x86/CONFIG_FB_VGA16 -+@@ -1 +1 @@ -+-# CONFIG_FB_VGA16 is not set -++CONFIG_FB_VGA16=m -+-- -+2.35.1 -+ diff --git a/Documentation/core-api/dma-attributes.rst b/Documentation/core-api/dma-attributes.rst index 1887d92e8e92..17706dc91ec9 100644 --- a/Documentation/core-api/dma-attributes.rst @@ -222,7 +105,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 34f9f5a9457a..799d71b74ea9 100644 +index 06d852cad74f..408d95c9769e 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -268,10 +151,10 @@ index 4c97cb40eebb..caf06cef3d2e 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index c842878f8133..72949bfbe1af 100644 +index baa0e9bbe754..7adce1807baf 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1109,7 +1109,7 @@ endchoice +@@ -1110,7 +1110,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -280,7 +163,7 @@ index c842878f8133..72949bfbe1af 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1348,6 +1348,7 @@ config XEN +@@ -1349,6 +1349,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -480,7 +363,7 @@ index fea082b25fe4..50a9d040bed1 100644 MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Random Number Generator"); diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 0edc1ed47673..782e2f399af2 100644 +index 6aef1ee5e1bd..8f146b1b4972 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -96,6 +96,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data) @@ -1036,7 +919,7 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c -index 00279e8c2775..545424e4a066 100644 +index b00de57cc957..c613b531b281 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -744,6 +744,15 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp, @@ -1438,30 +1321,8 @@ index 107dcf5938d6..225a9797e39d 100644 /* * Changes the default domain of an iommu group that has *only* one device * -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 2da804f84b48..bd5998012a87 100644 ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -76,7 +76,7 @@ static inline void bcmgenet_writel(u32 value, void __iomem *offset) - if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) - __raw_writel(value, offset); - else -- writel_relaxed(value, offset); -+ writel(value, offset); - } - - static inline u32 bcmgenet_readl(void __iomem *offset) -@@ -84,7 +84,7 @@ static inline u32 bcmgenet_readl(void __iomem *offset) - if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) - return __raw_readl(offset); - else -- return readl_relaxed(offset); -+ return readl(offset); - } - - static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv, diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index fd4720d37cc0..c31bc05ec139 100644 +index 6215d50ed3e7..10f1629e0940 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1528,7 +1389,7 @@ index fd4720d37cc0..c31bc05ec139 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index ff775235534c..94de4ecefe56 100644 +index a703f1f5fb64..d77c24333cb4 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -101,14 +101,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) @@ -1564,7 +1425,7 @@ index ff775235534c..94de4ecefe56 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -869,8 +875,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -870,8 +876,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 */ @@ -1575,10 +1436,10 @@ index ff775235534c..94de4ecefe56 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index a162f6c6da6e..0606205d5dcc 100644 +index 730cc80d84ff..3a57441b3ff3 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -770,6 +770,7 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); +@@ -789,6 +789,7 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags); void nvme_failover_req(struct request *req); @@ -1586,7 +1447,7 @@ index a162f6c6da6e..0606205d5dcc 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -808,6 +809,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, +@@ -827,6 +828,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, static inline void nvme_failover_req(struct request *req) { } @@ -1627,10 +1488,10 @@ index 9037a7827eca..e5900638483b 100644 pcibios_free_irq(dev); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 65f7f6b0576c..27398de38c0c 100644 +index da829274fc66..bb6e79ec3d00 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4272,6 +4272,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4284,6 +4284,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); @@ -1814,10 +1675,10 @@ index ccd4d3f91c98..e64643e3e364 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 819ec92dc2a8..b49986bfbeca 100644 +index db924fe379c9..1169d78af2de 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h -@@ -392,6 +392,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) +@@ -394,6 +394,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) #endif /* CONFIG_BPF_SYSCALL */ LSM_HOOK(int, 0, locked_down, enum lockdown_reason what) @@ -1827,10 +1688,10 @@ index 819ec92dc2a8..b49986bfbeca 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h -index 3bf5c658bc44..4701bc5ce2f5 100644 +index 419b5febc3ca..491323dfe4e0 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h -@@ -1544,6 +1544,12 @@ +@@ -1549,6 +1549,12 @@ * * @what: kernel feature being accessed * @@ -1930,7 +1791,7 @@ 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 6d72772182c8..fe3b072665fb 100644 +index 25b3ef71f495..d37a6c88c69f 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); @@ -1966,7 +1827,7 @@ index e9119bf54b1f..e3b57b4898fe 100644 default y help diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c -index 6db1c475ec82..bfc56cb21705 100644 +index 6c350555e5a1..bfc56cb21705 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -627,14 +627,10 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr, @@ -1988,24 +1849,6 @@ index 6db1c475ec82..bfc56cb21705 100644 return tlb_addr; } -@@ -701,13 +697,10 @@ void swiotlb_tbl_unmap_single(struct device *dev, phys_addr_t tlb_addr, - void swiotlb_sync_single_for_device(struct device *dev, phys_addr_t tlb_addr, - size_t size, enum dma_data_direction dir) - { -- /* -- * Unconditional bounce is necessary to avoid corruption on -- * sync_*_for_cpu or dma_ummap_* when the device didn't overwrite -- * the whole lengt of the bounce buffer. -- */ -- swiotlb_bounce(dev, tlb_addr, size, DMA_TO_DEVICE); -- BUG_ON(!valid_dma_direction(dir)); -+ if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) -+ swiotlb_bounce(dev, tlb_addr, size, DMA_TO_DEVICE); -+ else -+ BUG_ON(dir != DMA_FROM_DEVICE); - } - - void swiotlb_sync_single_for_cpu(struct device *dev, phys_addr_t tlb_addr, diff --git a/kernel/module.c b/kernel/module.c index 46a5c2ed1928..92c2306651ce 100644 --- a/kernel/module.c @@ -2062,33 +1905,8 @@ index 2882bc7d79d7..bc3a11ec0c27 100644 } kfree_skb(skb); -diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index fc30f4c03d29..2bca8cb1c68f 100644 ---- a/net/bluetooth/hci_event.c -+++ b/net/bluetooth/hci_event.c -@@ -6798,7 +6798,7 @@ static const struct hci_ev { - HCI_EV(HCI_EV_NUM_COMP_BLOCKS, hci_num_comp_blocks_evt, - sizeof(struct hci_ev_num_comp_blocks)), - /* [0xff = HCI_EV_VENDOR] */ -- HCI_EV(HCI_EV_VENDOR, msft_vendor_evt, 0), -+ HCI_EV_VL(HCI_EV_VENDOR, msft_vendor_evt, 0, HCI_MAX_EVENT_SIZE), - }; - - static void hci_event_func(struct hci_dev *hdev, u8 event, struct sk_buff *skb, -@@ -6823,8 +6823,9 @@ static void hci_event_func(struct hci_dev *hdev, u8 event, struct sk_buff *skb, - * decide if that is acceptable. - */ - if (skb->len > ev->max_len) -- bt_dev_warn(hdev, "unexpected event 0x%2.2x length: %u > %u", -- event, skb->len, ev->max_len); -+ bt_dev_warn_ratelimited(hdev, -+ "unexpected event 0x%2.2x length: %u > %u", -+ event, skb->len, ev->max_len); - - data = hci_ev_skb_pull(hdev, skb, event, ev->min_len); - if (!data) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 6bfa33217914..92d936f34b27 100644 +index e04ae56931e2..da97e6a8ee0a 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -21,6 +21,7 @@ @@ -2194,10 +2012,10 @@ index 87cbdc64d272..18555cf18da7 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index 22261d79f333..20336365f864 100644 +index b7cf5cbfdc67..3cde9062fcf6 100644 --- a/security/security.c +++ b/security/security.c -@@ -2603,6 +2603,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2623,6 +2623,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); |