]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Feb 2024 03:46:52 +0000 (19:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Feb 2024 03:46:52 +0000 (19:46 -0800)
added patches:
bonding-remove-print-in-bond_verify_device_path.patch

queue-6.1/bonding-remove-print-in-bond_verify_device_path.patch [new file with mode: 0644]
queue-6.1/series

diff --git a/queue-6.1/bonding-remove-print-in-bond_verify_device_path.patch b/queue-6.1/bonding-remove-print-in-bond_verify_device_path.patch
new file mode 100644 (file)
index 0000000..021e7a4
--- /dev/null
@@ -0,0 +1,39 @@
+From 486058f42a4728053ae69ebbf78e9731d8ce6f8b Mon Sep 17 00:00:00 2001
+From: Zhengchao Shao <shaozhengchao@huawei.com>
+Date: Thu, 23 Nov 2023 09:55:15 +0800
+Subject: bonding: remove print in bond_verify_device_path
+
+From: Zhengchao Shao <shaozhengchao@huawei.com>
+
+commit 486058f42a4728053ae69ebbf78e9731d8ce6f8b upstream.
+
+As suggested by Paolo in link[1], if the memory allocation fails, the mm
+layer will emit a lot warning comprising the backtrace, so remove the
+print.
+
+[1] https://lore.kernel.org/all/20231118081653.1481260-1-shaozhengchao@huawei.com/
+
+Suggested-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
+Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/bonding/bond_main.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/drivers/net/bonding/bond_main.c
++++ b/drivers/net/bonding/bond_main.c
+@@ -2943,11 +2943,8 @@ struct bond_vlan_tag *bond_verify_device
+       if (start_dev == end_dev) {
+               tags = kcalloc(level + 1, sizeof(*tags), GFP_ATOMIC);
+-              if (!tags) {
+-                      net_err_ratelimited("%s: %s: Failed to allocate tags\n",
+-                                          __func__, start_dev->name);
++              if (!tags)
+                       return ERR_PTR(-ENOMEM);
+-              }
+               tags[level].vlan_proto = VLAN_N_VID;
+               return tags;
+       }
index 6f24d3faaa88e8e5db62d1a5e4ad6b427da56572..ce918e4ae0076df83f8aa2ab03d72deb16cdec27 100644 (file)
@@ -109,7 +109,6 @@ rdma-ipoib-fix-error-code-return-in-ipoib_mcast_join.patch
 drm-panel-edp-add-override_edid_mode-quirk-for-gener.patch
 drm-bridge-anx7625-fix-set-hpd-irq-detect-window-to-.patch
 drm-amd-display-fix-tiled-display-misalignment.patch
-media-renesas-vsp1-fix-references-to-pad-config.patch
 f2fs-fix-write-pointers-on-zoned-device-after-roll-f.patch
 asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch
 drm-drm_file-fix-use-of-uninitialized-variable.patch
@@ -217,3 +216,4 @@ revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch
 drm-msm-dsi-enable-runtime-pm.patch
 loongarch-smp-call-rcutree_report_cpu_starting-at-tlb_init.patch
 gve-fix-use-after-free-vulnerability.patch
+bonding-remove-print-in-bond_verify_device_path.patch