From: Sasha Levin Date: Sun, 11 Aug 2024 21:16:55 +0000 (-0400) Subject: Drop r8169-remove-detection-of-chip-version-11-early-rtl8.patch X-Git-Tag: v6.1.105~107 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b30e3be493afbde0f22158a79dffea5184a79de;p=thirdparty%2Fkernel%2Fstable-queue.git Drop r8169-remove-detection-of-chip-version-11-early-rtl8.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/r8169-remove-detection-of-chip-version-11-early-rtl8.patch b/queue-5.10/r8169-remove-detection-of-chip-version-11-early-rtl8.patch deleted file mode 100644 index c4e305b4401..00000000000 --- a/queue-5.10/r8169-remove-detection-of-chip-version-11-early-rtl8.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1c40610b961f8a4ddc71c0b9849e67434ac633fb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 May 2024 21:20:16 +0200 -Subject: r8169: remove detection of chip version 11 (early RTL8168b) - -From: Heiner Kallweit - -[ Upstream commit 982300c115d229565d7af8e8b38aa1ee7bb1f5bd ] - -This early RTL8168b version was the first PCIe chip version, and it's -quite quirky. Last sign of life is from more than 15 yrs ago. -Let's remove detection of this chip version, we'll see whether anybody -complains. If not, support for this chip version can be removed a few -kernel versions later. - -Signed-off-by: Heiner Kallweit -Link: https://lore.kernel.org/r/875cdcf4-843c-420a-ad5d-417447b68572@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/realtek/r8169_main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index 4c588fc43eb9b..76fe940aec122 100644 ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -2018,7 +2018,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) - /* 8168B family. */ - { 0x7cf, 0x380, RTL_GIGA_MAC_VER_12 }, - { 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 }, -- { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ /* This one is very old and rare, let's see if anybody complains. -+ * { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ */ - - /* 8101 family. */ - { 0x7c8, 0x448, RTL_GIGA_MAC_VER_39 }, --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 89df40339ae..50c577ca4e0 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -275,7 +275,6 @@ md-raid5-avoid-bug_on-while-continue-reshape-after-r.patch clocksource-drivers-sh_cmt-address-race-condition-fo.patch acpi-battery-create-alarm-sysfs-attribute-atomically.patch acpi-sbs-manage-alarm-sysfs-attribute-through-psy-co.patch -r8169-remove-detection-of-chip-version-11-early-rtl8.patch selftests-bpf-fix-send_signal-test-with-nested-confi.patch pci-add-edimax-vendor-id-to-pci_ids.h.patch udf-prevent-integer-overflow-in-udf_bitmap_free_bloc.patch diff --git a/queue-5.15/r8169-remove-detection-of-chip-version-11-early-rtl8.patch b/queue-5.15/r8169-remove-detection-of-chip-version-11-early-rtl8.patch deleted file mode 100644 index f3296b13d49..00000000000 --- a/queue-5.15/r8169-remove-detection-of-chip-version-11-early-rtl8.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ad6c1a89317359fbf98a03ddfc9ae71a7e153bf6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 May 2024 21:20:16 +0200 -Subject: r8169: remove detection of chip version 11 (early RTL8168b) - -From: Heiner Kallweit - -[ Upstream commit 982300c115d229565d7af8e8b38aa1ee7bb1f5bd ] - -This early RTL8168b version was the first PCIe chip version, and it's -quite quirky. Last sign of life is from more than 15 yrs ago. -Let's remove detection of this chip version, we'll see whether anybody -complains. If not, support for this chip version can be removed a few -kernel versions later. - -Signed-off-by: Heiner Kallweit -Link: https://lore.kernel.org/r/875cdcf4-843c-420a-ad5d-417447b68572@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/realtek/r8169_main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index 49a3cd4ce89c2..4284fd9e4e5ce 100644 ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -2063,7 +2063,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) - /* 8168B family. */ - { 0x7cf, 0x380, RTL_GIGA_MAC_VER_12 }, - { 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 }, -- { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ /* This one is very old and rare, let's see if anybody complains. -+ * { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ */ - - /* 8101 family. */ - { 0x7c8, 0x448, RTL_GIGA_MAC_VER_39 }, --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 9736a6beb68..2c19598b854 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -390,7 +390,6 @@ md-raid5-avoid-bug_on-while-continue-reshape-after-r.patch clocksource-drivers-sh_cmt-address-race-condition-fo.patch acpi-battery-create-alarm-sysfs-attribute-atomically.patch acpi-sbs-manage-alarm-sysfs-attribute-through-psy-co.patch -r8169-remove-detection-of-chip-version-11-early-rtl8.patch selftests-bpf-fix-send_signal-test-with-nested-confi.patch pci-add-edimax-vendor-id-to-pci_ids.h.patch udf-prevent-integer-overflow-in-udf_bitmap_free_bloc.patch diff --git a/queue-5.4/r8169-remove-detection-of-chip-version-11-early-rtl8.patch b/queue-5.4/r8169-remove-detection-of-chip-version-11-early-rtl8.patch deleted file mode 100644 index e85da62f434..00000000000 --- a/queue-5.4/r8169-remove-detection-of-chip-version-11-early-rtl8.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 757b6878c7ecca73a234070ac7643d1211ca55c7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 May 2024 21:20:16 +0200 -Subject: r8169: remove detection of chip version 11 (early RTL8168b) - -From: Heiner Kallweit - -[ Upstream commit 982300c115d229565d7af8e8b38aa1ee7bb1f5bd ] - -This early RTL8168b version was the first PCIe chip version, and it's -quite quirky. Last sign of life is from more than 15 yrs ago. -Let's remove detection of this chip version, we'll see whether anybody -complains. If not, support for this chip version can be removed a few -kernel versions later. - -Signed-off-by: Heiner Kallweit -Link: https://lore.kernel.org/r/875cdcf4-843c-420a-ad5d-417447b68572@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/realtek/r8169_main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index 319f8d7a502da..32ea1d902a173 100644 ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -2185,7 +2185,9 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp) - /* 8168B family. */ - { 0x7cf, 0x380, RTL_GIGA_MAC_VER_12 }, - { 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 }, -- { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ /* This one is very old and rare, let's see if anybody complains. -+ * { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ */ - - /* 8101 family. */ - { 0x7c8, 0x448, RTL_GIGA_MAC_VER_39 }, --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 95745dcd3e0..3f34e000a98 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -194,7 +194,6 @@ md-raid5-avoid-bug_on-while-continue-reshape-after-r.patch clocksource-drivers-sh_cmt-address-race-condition-fo.patch acpi-battery-create-alarm-sysfs-attribute-atomically.patch acpi-sbs-manage-alarm-sysfs-attribute-through-psy-co.patch -r8169-remove-detection-of-chip-version-11-early-rtl8.patch selftests-bpf-fix-send_signal-test-with-nested-confi.patch pci-add-edimax-vendor-id-to-pci_ids.h.patch udf-prevent-integer-overflow-in-udf_bitmap_free_bloc.patch diff --git a/queue-6.1/r8169-remove-detection-of-chip-version-11-early-rtl8.patch b/queue-6.1/r8169-remove-detection-of-chip-version-11-early-rtl8.patch deleted file mode 100644 index 240fd22e9da..00000000000 --- a/queue-6.1/r8169-remove-detection-of-chip-version-11-early-rtl8.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d52061b428850a08eabadb07139011dad47f63f0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 May 2024 21:20:16 +0200 -Subject: r8169: remove detection of chip version 11 (early RTL8168b) - -From: Heiner Kallweit - -[ Upstream commit 982300c115d229565d7af8e8b38aa1ee7bb1f5bd ] - -This early RTL8168b version was the first PCIe chip version, and it's -quite quirky. Last sign of life is from more than 15 yrs ago. -Let's remove detection of this chip version, we'll see whether anybody -complains. If not, support for this chip version can be removed a few -kernel versions later. - -Signed-off-by: Heiner Kallweit -Link: https://lore.kernel.org/r/875cdcf4-843c-420a-ad5d-417447b68572@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/realtek/r8169_main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index b187371fa2f0a..2e9de2ca45abe 100644 ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -2119,7 +2119,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) - - /* 8168B family. */ - { 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 }, -- { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ /* This one is very old and rare, let's see if anybody complains. -+ * { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ */ - - /* 8101 family. */ - { 0x7c8, 0x448, RTL_GIGA_MAC_VER_39 }, --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 7597c02d514..6b736db83c5 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -23,7 +23,6 @@ clocksource-drivers-sh_cmt-address-race-condition-fo.patch acpi-battery-create-alarm-sysfs-attribute-atomically.patch acpi-sbs-manage-alarm-sysfs-attribute-through-psy-co.patch wifi-nl80211-disallow-setting-special-ap-channel-wid.patch -r8169-remove-detection-of-chip-version-11-early-rtl8.patch net-mlx5e-shampo-fix-invalid-wq-linked-list-unlink.patch selftests-bpf-fix-send_signal-test-with-nested-confi.patch af_unix-don-t-retry-after-unix_state_lock_nested-in-.patch diff --git a/queue-6.10/r8169-remove-detection-of-chip-version-11-early-rtl8.patch b/queue-6.10/r8169-remove-detection-of-chip-version-11-early-rtl8.patch deleted file mode 100644 index 61a00aada40..00000000000 --- a/queue-6.10/r8169-remove-detection-of-chip-version-11-early-rtl8.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c95d51f2944b26eb1d7db90295af840770ed150c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 May 2024 21:20:16 +0200 -Subject: r8169: remove detection of chip version 11 (early RTL8168b) - -From: Heiner Kallweit - -[ Upstream commit 982300c115d229565d7af8e8b38aa1ee7bb1f5bd ] - -This early RTL8168b version was the first PCIe chip version, and it's -quite quirky. Last sign of life is from more than 15 yrs ago. -Let's remove detection of this chip version, we'll see whether anybody -complains. If not, support for this chip version can be removed a few -kernel versions later. - -Signed-off-by: Heiner Kallweit -Link: https://lore.kernel.org/r/875cdcf4-843c-420a-ad5d-417447b68572@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/realtek/r8169_main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index b6e89fc5a4ae7..e5f883a66f47a 100644 ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -2274,7 +2274,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) - - /* 8168B family. */ - { 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 }, -- { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ /* This one is very old and rare, let's see if anybody complains. -+ * { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ */ - - /* 8101 family. */ - { 0x7c8, 0x448, RTL_GIGA_MAC_VER_39 }, --- -2.43.0 - diff --git a/queue-6.10/series b/queue-6.10/series index caa958835ab..e9f4fbf1908 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -64,7 +64,6 @@ acpi-resource-skip-irq-override-on-asus-vivobook-pro.patch-7833 thermal-intel-hfi-give-hfi-instances-package-scope.patch wifi-nl80211-disallow-setting-special-ap-channel-wid.patch wifi-ath12k-fix-race-due-to-setting-ath12k_flag_ext_.patch -r8169-remove-detection-of-chip-version-11-early-rtl8.patch wifi-rtlwifi-handle-return-value-of-usb-init-tx-rx.patch wifi-ath12k-fix-memory-leak-in-ath12k_dp_rx_peer_fra.patch net-mlx5e-shampo-fix-invalid-wq-linked-list-unlink.patch diff --git a/queue-6.6/r8169-remove-detection-of-chip-version-11-early-rtl8.patch b/queue-6.6/r8169-remove-detection-of-chip-version-11-early-rtl8.patch deleted file mode 100644 index 5ede466a73c..00000000000 --- a/queue-6.6/r8169-remove-detection-of-chip-version-11-early-rtl8.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 384648aa4771a4ba963f7ccf05c569fe4ebe588a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 May 2024 21:20:16 +0200 -Subject: r8169: remove detection of chip version 11 (early RTL8168b) - -From: Heiner Kallweit - -[ Upstream commit 982300c115d229565d7af8e8b38aa1ee7bb1f5bd ] - -This early RTL8168b version was the first PCIe chip version, and it's -quite quirky. Last sign of life is from more than 15 yrs ago. -Let's remove detection of this chip version, we'll see whether anybody -complains. If not, support for this chip version can be removed a few -kernel versions later. - -Signed-off-by: Heiner Kallweit -Link: https://lore.kernel.org/r/875cdcf4-843c-420a-ad5d-417447b68572@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/realtek/r8169_main.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index 8a732edac15a0..e924153ab6bb7 100644 ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -2135,7 +2135,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) - - /* 8168B family. */ - { 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 }, -- { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ /* This one is very old and rare, let's see if anybody complains. -+ * { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 }, -+ */ - - /* 8101 family. */ - { 0x7c8, 0x448, RTL_GIGA_MAC_VER_39 }, --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index c68ee3f5df9..ffd0adee7e3 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -35,7 +35,6 @@ acpi-battery-create-alarm-sysfs-attribute-atomically.patch acpi-sbs-manage-alarm-sysfs-attribute-through-psy-co.patch xen-privcmd-switch-from-mutex-to-spinlock-for-irqfds.patch wifi-nl80211-disallow-setting-special-ap-channel-wid.patch -r8169-remove-detection-of-chip-version-11-early-rtl8.patch wifi-ath12k-fix-memory-leak-in-ath12k_dp_rx_peer_fra.patch net-mlx5e-shampo-fix-invalid-wq-linked-list-unlink.patch selftests-bpf-fix-send_signal-test-with-nested-confi.patch