]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some rejected patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jan 2023 09:16:33 +0000 (10:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jan 2023 09:16:33 +0000 (10:16 +0100)
queue-4.14/series
queue-4.14/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch [deleted file]
queue-4.19/drm-amdgpu-make-display-pinning-more-flexible-v2.patch [deleted file]
queue-4.19/series
queue-4.19/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch [deleted file]
queue-5.4/drm-amdgpu-make-display-pinning-more-flexible-v2.patch [deleted file]
queue-5.4/series
queue-5.4/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch [deleted file]

index 00e069507a4e79be9a472d3be24681d5507960a4..6a3c237b025a2da4c2a1ab6aa8b4fbb9e5c366fd 100644 (file)
@@ -94,7 +94,6 @@ drm-radeon-fix-pci-device-refcount-leak-in-radeon_at.patch
 drm-amdgpu-fix-pci-device-refcount-leak-in-amdgpu_at.patch
 asoc-pcm512x-fix-pm-disable-depth-imbalance-in-pcm51.patch
 bonding-uninitialized-variable-in-bond_miimon_inspec.patch
-wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch
 regulator-core-fix-module-refcount-leak-in-set_suppl.patch
 media-saa7164-fix-missing-pci_disable_device.patch
 alsa-mts64-fix-possible-null-ptr-defer-in-snd_mts64_.patch
diff --git a/queue-4.14/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch b/queue-4.14/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch
deleted file mode 100644 (file)
index 4ddd090..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 59a9d6ebc05a27bac21a07a9d49a67514db7d829 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 17 Nov 2022 14:45:00 +0800
-Subject: wifi: mac80211: fix memory leak in ieee80211_if_add()
-
-From: Zhengchao Shao <shaozhengchao@huawei.com>
-
-[ Upstream commit 13e5afd3d773c6fc6ca2b89027befaaaa1ea7293 ]
-
-When register_netdevice() failed in ieee80211_if_add(), ndev->tstats
-isn't released. Fix it.
-
-Fixes: 5a490510ba5f ("mac80211: use per-CPU TX/RX statistics")
-Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
-Link: https://lore.kernel.org/r/20221117064500.319983-1-shaozhengchao@huawei.com
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/iface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index adafa29d3021..69af1d1ae33c 100644
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -1902,6 +1902,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
-               ret = register_netdevice(ndev);
-               if (ret) {
-+                      ieee80211_if_free(ndev);
-                       free_netdev(ndev);
-                       return ret;
-               }
--- 
-2.35.1
-
diff --git a/queue-4.19/drm-amdgpu-make-display-pinning-more-flexible-v2.patch b/queue-4.19/drm-amdgpu-make-display-pinning-more-flexible-v2.patch
deleted file mode 100644 (file)
index d89ec2b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 81d0bcf9900932633d270d5bc4a54ff599c6ebdb Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 7 Dec 2022 11:08:53 -0500
-Subject: drm/amdgpu: make display pinning more flexible (v2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Alex Deucher <alexander.deucher@amd.com>
-
-commit 81d0bcf9900932633d270d5bc4a54ff599c6ebdb upstream.
-
-Only apply the static threshold for Stoney and Carrizo.
-This hardware has certain requirements that don't allow
-mixing of GTT and VRAM.  Newer asics do not have these
-requirements so we should be able to be more flexible
-with where buffers end up.
-
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2270
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2291
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2255
-Acked-by: Luben Tuikov <luben.tuikov@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-@@ -1387,7 +1387,8 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_b
- uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
-                                           uint32_t domain)
- {
--      if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
-+      if ((domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) &&
-+          ((adev->asic_type == CHIP_CARRIZO) || (adev->asic_type == CHIP_STONEY))) {
-               domain = AMDGPU_GEM_DOMAIN_VRAM;
-               if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
-                       domain = AMDGPU_GEM_DOMAIN_GTT;
index d120abcdc1f4c5e2adf9d06d14533a812a44f96c..717deffb9153b46ec2720debc2f9f94d85b3ffdf 100644 (file)
@@ -126,7 +126,6 @@ drm-radeon-fix-pci-device-refcount-leak-in-radeon_at.patch
 drm-amdgpu-fix-pci-device-refcount-leak-in-amdgpu_at.patch
 asoc-pcm512x-fix-pm-disable-depth-imbalance-in-pcm51.patch
 bonding-uninitialized-variable-in-bond_miimon_inspec.patch
-wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch
 wifi-cfg80211-fix-not-unregister-reg_pdev-when-load_.patch
 regulator-core-fix-module-refcount-leak-in-set_suppl.patch
 media-saa7164-fix-missing-pci_disable_device.patch
@@ -415,7 +414,6 @@ ext4-fix-inode-leak-in-ext4_xattr_inode_create-on-an-error-path.patch
 ext4-initialize-quota-before-expanding-inode-in-setproject-ioctl.patch
 ext4-avoid-unaccounted-block-allocation-when-expanding-inode.patch
 ext4-allocate-extended-attribute-value-in-vmalloc-area.patch
-drm-amdgpu-make-display-pinning-more-flexible-v2.patch
 btrfs-send-avoid-unnecessary-backref-lookups-when-fi.patch
 btrfs-replace-strncpy-with-strscpy.patch
 media-s5p-mfc-fix-to-handle-reference-queue-during-f.patch
diff --git a/queue-4.19/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch b/queue-4.19/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch
deleted file mode 100644 (file)
index e1b8696..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 27e908352316cb12a174037ca597285139867b00 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 17 Nov 2022 14:45:00 +0800
-Subject: wifi: mac80211: fix memory leak in ieee80211_if_add()
-
-From: Zhengchao Shao <shaozhengchao@huawei.com>
-
-[ Upstream commit 13e5afd3d773c6fc6ca2b89027befaaaa1ea7293 ]
-
-When register_netdevice() failed in ieee80211_if_add(), ndev->tstats
-isn't released. Fix it.
-
-Fixes: 5a490510ba5f ("mac80211: use per-CPU TX/RX statistics")
-Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
-Link: https://lore.kernel.org/r/20221117064500.319983-1-shaozhengchao@huawei.com
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/iface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 358028a09ce4..5d252d144cb9 100644
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -1888,6 +1888,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
-               ret = register_netdevice(ndev);
-               if (ret) {
-+                      ieee80211_if_free(ndev);
-                       free_netdev(ndev);
-                       return ret;
-               }
--- 
-2.35.1
-
diff --git a/queue-5.4/drm-amdgpu-make-display-pinning-more-flexible-v2.patch b/queue-5.4/drm-amdgpu-make-display-pinning-more-flexible-v2.patch
deleted file mode 100644 (file)
index b46556f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 81d0bcf9900932633d270d5bc4a54ff599c6ebdb Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 7 Dec 2022 11:08:53 -0500
-Subject: drm/amdgpu: make display pinning more flexible (v2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Alex Deucher <alexander.deucher@amd.com>
-
-commit 81d0bcf9900932633d270d5bc4a54ff599c6ebdb upstream.
-
-Only apply the static threshold for Stoney and Carrizo.
-This hardware has certain requirements that don't allow
-mixing of GTT and VRAM.  Newer asics do not have these
-requirements so we should be able to be more flexible
-with where buffers end up.
-
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2270
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2291
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2255
-Acked-by: Luben Tuikov <luben.tuikov@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-@@ -1458,7 +1458,8 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_b
- uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
-                                           uint32_t domain)
- {
--      if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
-+      if ((domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) &&
-+          ((adev->asic_type == CHIP_CARRIZO) || (adev->asic_type == CHIP_STONEY))) {
-               domain = AMDGPU_GEM_DOMAIN_VRAM;
-               if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
-                       domain = AMDGPU_GEM_DOMAIN_GTT;
index 62f7a94a783b10ca24c931905327ea1a8c6000f1..9b4ca5195834c0397f4e1776b0a8f9ba5084fcbe 100644 (file)
@@ -172,7 +172,6 @@ bpf-sockmap-fix-repeated-calls-to-sock_put-when-msg-.patch
 bpf-sockmap-fix-data-loss-caused-by-using-apply_byte.patch
 bonding-uninitialized-variable-in-bond_miimon_inspec.patch
 spi-spidev-mask-spi_cs_high-in-spi_ioc_rd_mode.patch
-wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch
 wifi-cfg80211-fix-not-unregister-reg_pdev-when-load_.patch
 regulator-core-fix-module-refcount-leak-in-set_suppl.patch
 clk-qcom-clk-krait-fix-wrong-div2-functions.patch
@@ -534,7 +533,6 @@ ext4-fix-inode-leak-in-ext4_xattr_inode_create-on-an-error-path.patch
 ext4-initialize-quota-before-expanding-inode-in-setproject-ioctl.patch
 ext4-avoid-unaccounted-block-allocation-when-expanding-inode.patch
 ext4-allocate-extended-attribute-value-in-vmalloc-area.patch
-drm-amdgpu-make-display-pinning-more-flexible-v2.patch
 btrfs-replace-strncpy-with-strscpy.patch
 pm-devfreq-governor-add-a-private-governor_data-for-.patch
 media-s5p-mfc-fix-to-handle-reference-queue-during-f.patch
diff --git a/queue-5.4/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch b/queue-5.4/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch
deleted file mode 100644 (file)
index 48cf0cc..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 678d04a238d7c121236b07f18dad4837efd29d2b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 17 Nov 2022 14:45:00 +0800
-Subject: wifi: mac80211: fix memory leak in ieee80211_if_add()
-
-From: Zhengchao Shao <shaozhengchao@huawei.com>
-
-[ Upstream commit 13e5afd3d773c6fc6ca2b89027befaaaa1ea7293 ]
-
-When register_netdevice() failed in ieee80211_if_add(), ndev->tstats
-isn't released. Fix it.
-
-Fixes: 5a490510ba5f ("mac80211: use per-CPU TX/RX statistics")
-Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
-Link: https://lore.kernel.org/r/20221117064500.319983-1-shaozhengchao@huawei.com
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/mac80211/iface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index ddc001ad9055..cb06439e087c 100644
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -1888,6 +1888,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
-               ret = register_netdevice(ndev);
-               if (ret) {
-+                      ieee80211_if_free(ndev);
-                       free_netdev(ndev);
-                       return ret;
-               }
--- 
-2.35.1
-