From: Greg Kroah-Hartman Date: Tue, 17 Jan 2023 09:16:33 +0000 (+0100) Subject: drop some rejected patches X-Git-Tag: v4.14.303~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7a3984e03327bd77a59501c251384fbc1fc7e43;p=thirdparty%2Fkernel%2Fstable-queue.git drop some rejected patches --- diff --git a/queue-4.14/series b/queue-4.14/series index 00e069507a4..6a3c237b025 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -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 index 4ddd0904e45..00000000000 --- a/queue-4.14/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 59a9d6ebc05a27bac21a07a9d49a67514db7d829 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 17 Nov 2022 14:45:00 +0800 -Subject: wifi: mac80211: fix memory leak in ieee80211_if_add() - -From: Zhengchao Shao - -[ 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 -Link: https://lore.kernel.org/r/20221117064500.319983-1-shaozhengchao@huawei.com -Signed-off-by: Johannes Berg -Signed-off-by: Sasha Levin ---- - 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 index d89ec2b8adf..00000000000 --- a/queue-4.19/drm-amdgpu-make-display-pinning-more-flexible-v2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 81d0bcf9900932633d270d5bc4a54ff599c6ebdb Mon Sep 17 00:00:00 2001 -From: Alex Deucher -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 - -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 -Reviewed-by: Christian König -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - 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; diff --git a/queue-4.19/series b/queue-4.19/series index d120abcdc1f..717deffb915 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -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 index e1b86964f5b..00000000000 --- a/queue-4.19/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 27e908352316cb12a174037ca597285139867b00 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 17 Nov 2022 14:45:00 +0800 -Subject: wifi: mac80211: fix memory leak in ieee80211_if_add() - -From: Zhengchao Shao - -[ 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 -Link: https://lore.kernel.org/r/20221117064500.319983-1-shaozhengchao@huawei.com -Signed-off-by: Johannes Berg -Signed-off-by: Sasha Levin ---- - 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 index b46556f0be5..00000000000 --- a/queue-5.4/drm-amdgpu-make-display-pinning-more-flexible-v2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 81d0bcf9900932633d270d5bc4a54ff599c6ebdb Mon Sep 17 00:00:00 2001 -From: Alex Deucher -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 - -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 -Reviewed-by: Christian König -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - 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; diff --git a/queue-5.4/series b/queue-5.4/series index 62f7a94a783..9b4ca519583 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -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 index 48cf0cc1a20..00000000000 --- a/queue-5.4/wifi-mac80211-fix-memory-leak-in-ieee80211_if_add.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 678d04a238d7c121236b07f18dad4837efd29d2b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 17 Nov 2022 14:45:00 +0800 -Subject: wifi: mac80211: fix memory leak in ieee80211_if_add() - -From: Zhengchao Shao - -[ 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 -Link: https://lore.kernel.org/r/20221117064500.319983-1-shaozhengchao@huawei.com -Signed-off-by: Johannes Berg -Signed-off-by: Sasha Levin ---- - 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 -