Skip to content

Commit 21cb0ea

Browse files
MingcongBaiMingcongBai
committed
linux-kernel-rc: update to 6.18.0-rc7
- Refresh YT6801 patches (suspend/resume v5, YT6801 v3). - Add patches for pre-upstream TH1520 support (AOSC-Tracking/linux#15). - Drop broken KVM AVEC patch and unneeded AVEC IRQ redirect patch. - (amd64) Enable DEBUG_INFO_BTF. - (loongarch64) Enable ZBOOT, disable broken PATA_LEGACY. - (riscv64) Enable TH1520 options. - Refresh all configurations. - Track patches at AOSC-Tracking/linux @ aosc/v6.18-rc7 (HEAD: 1db9d99ccffa495041850bd1a8d8a3c2fa82a23c).
1 parent 7c59aee commit 21cb0ea

File tree

407 files changed

+8694
-2494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+8694
-2494
lines changed

‎runtime-kernel/linux-kernel-rc/autobuild/amd64/config‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,7 +1946,8 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
19461946
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
19471947
CONFIG_DEBUG_FS=y
19481948
# CONFIG_DEBUG_GPIO is not set
1949-
# CONFIG_DEBUG_INFO_BTF is not set
1949+
CONFIG_DEBUG_INFO_BTF_MODULES=y
1950+
CONFIG_DEBUG_INFO_BTF=y
19501951
# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set
19511952
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
19521953
CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=y
@@ -3183,6 +3184,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
31833184
CONFIG_FUNCTION_PADDING_BYTES=16
31843185
CONFIG_FUNCTION_PADDING_CFI=11
31853186
CONFIG_FUNCTION_PROFILER=y
3187+
CONFIG_FUNCTION_TRACE_ARGS=y
31863188
CONFIG_FUNCTION_TRACER=y
31873189
CONFIG_FUN_ETH=m
31883190
CONFIG_FUSE_DAX=y
@@ -3583,6 +3585,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
35833585
CONFIG_HAVE_GCC_PLUGINS=y
35843586
CONFIG_HAVE_GENERIC_TIF_BITS=y
35853587
CONFIG_HAVE_GENERIC_VDSO=y
3588+
CONFIG_HAVE_GIGANTIC_FOLIOS=y
35863589
CONFIG_HAVE_GUP_FAST=y
35873590
CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
35883591
CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
@@ -5786,6 +5789,7 @@ CONFIG_MMU_NOTIFIER=y
57865789
CONFIG_MMU=y
57875790
CONFIG_MODIFY_LDT_SYSCALL=y
57885791
CONFIG_MODPROBE_PATH="/sbin/modprobe"
5792+
# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set
57895793
CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
57905794
CONFIG_MODULE_COMPRESS_ALL=y
57915795
# CONFIG_MODULE_COMPRESS_GZIP is not set
@@ -6345,6 +6349,7 @@ CONFIG_NET_PTP_CLASSIFY=y
63456349
CONFIG_NET_REDIRECT=y
63466350
CONFIG_NETROM=m
63476351
CONFIG_NET_RX_BUSY_POLL=y
6352+
# CONFIG_NET_SCH_BPF is not set
63486353
CONFIG_NET_SCH_CAKE=m
63496354
CONFIG_NET_SCH_CBS=m
63506355
CONFIG_NET_SCH_CHOKE=m
@@ -7333,6 +7338,7 @@ CONFIG_PRINTER=m
73337338
CONFIG_PRINTK_INDEX=y
73347339
CONFIG_PRINTK_TIME=y
73357340
CONFIG_PRINTK=y
7341+
CONFIG_PROBE_EVENTS_BTF_ARGS=y
73367342
CONFIG_PROBE_EVENTS=y
73377343
CONFIG_PROC_CHILDREN=y
73387344
CONFIG_PROC_CPU_RESCTRL=y
@@ -8094,8 +8100,8 @@ CONFIG_RUSTC_HAS_FILE_WITH_NUL=y
80948100
CONFIG_RUSTC_HAS_SPAN_FILE=y
80958101
CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
80968102
CONFIG_RUSTC_LLVM_VERSION=200108
8097-
CONFIG_RUSTC_VERSION=109100
8098-
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.0 (f8297e351 2025-10-28) (built from a source tarball)"
8103+
CONFIG_RUSTC_VERSION=109101
8104+
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.1 (ed61e7d7e 2025-11-07) (built from a source tarball)"
80998105
# CONFIG_RUST_DEBUG_ASSERTIONS is not set
81008106
CONFIG_RUST_FW_LOADER_ABSTRACTIONS=y
81018107
CONFIG_RUST_IS_AVAILABLE=y
@@ -8160,6 +8166,7 @@ CONFIG_SCD30_SERIAL=m
81608166
CONFIG_SCD4X=m
81618167
# CONFIG_SCF_TORTURE_TEST is not set
81628168
CONFIG_SCHED_AUTOGROUP=y
8169+
# CONFIG_SCHED_CLASS_EXT is not set
81638170
CONFIG_SCHED_CLUSTER=y
81648171
CONFIG_SCHED_CORE=y
81658172
CONFIG_SCHED_HRTICK=y

‎runtime-kernel/linux-kernel-rc/autobuild/arm64/config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4186,6 +4186,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
41864186
CONFIG_HAVE_FUNCTION_TRACER=y
41874187
CONFIG_HAVE_GCC_PLUGINS=y
41884188
CONFIG_HAVE_GENERIC_VDSO=y
4189+
CONFIG_HAVE_GIGANTIC_FOLIOS=y
41894190
CONFIG_HAVE_GUP_FAST=y
41904191
CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
41914192
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -9420,8 +9421,8 @@ CONFIG_RUSTC_HAS_SPAN_FILE=y
94209421
CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
94219422
CONFIG_RUSTC_LLVM_VERSION=200108
94229423
CONFIG_RUSTC_SUPPORTS_ARM64=y
9423-
CONFIG_RUSTC_VERSION=109100
9424-
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.0 (f8297e351 2025-10-28) (built from a source tarball)"
9424+
CONFIG_RUSTC_VERSION=109101
9425+
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.1 (ed61e7d7e 2025-11-07) (built from a source tarball)"
94259426
# CONFIG_RUST_DEBUG_ASSERTIONS is not set
94269427
CONFIG_RUST_FW_LOADER_ABSTRACTIONS=y
94279428
CONFIG_RUST_IS_AVAILABLE=y

‎runtime-kernel/linux-kernel-rc/autobuild/loongarch64/config.16k‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,14 +2424,15 @@ CONFIG_EFI_ESRT=y
24242424
CONFIG_EFI_GENERIC_STUB=y
24252425
CONFIG_EFI_PARTITION=y
24262426
CONFIG_EFI_RUNTIME_WRAPPERS=y
2427+
CONFIG_EFI_SBAT_FILE=""
24272428
CONFIG_EFI_SOFT_RESERVE=y
24282429
CONFIG_EFI_STUB=y
24292430
CONFIG_EFI_TEST=m
24302431
CONFIG_EFIVAR_FS=y
24312432
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
24322433
CONFIG_EFI_VARS_PSTORE=y
24332434
CONFIG_EFI=y
2434-
# CONFIG_EFI_ZBOOT is not set
2435+
CONFIG_EFI_ZBOOT=y
24352436
CONFIG_EFS_FS=m
24362437
CONFIG_ELF_CORE=y
24372438
CONFIG_ELFCORE=y
@@ -3113,6 +3114,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
31133114
CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
31143115
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
31153116
CONFIG_HAVE_KCSAN_COMPILER=y
3117+
CONFIG_HAVE_KERNEL_GZIP=y
3118+
CONFIG_HAVE_KERNEL_ZSTD=y
31163119
CONFIG_HAVE_KPROBES_ON_FTRACE=y
31173120
CONFIG_HAVE_KPROBES=y
31183121
CONFIG_HAVE_KRETPROBES=y
@@ -4101,6 +4104,8 @@ CONFIG_KARMA_PARTITION=y
41014104
CONFIG_KCMP=y
41024105
# CONFIG_KCOV is not set
41034106
CONFIG_KEMPLD_WDT=m
4107+
# CONFIG_KERNEL_GZIP is not set
4108+
CONFIG_KERNEL_ZSTD=y
41044109
CONFIG_KERNFS=y
41054110
CONFIG_KEXEC_CORE=y
41064111
CONFIG_KEXEC_ELF=y
@@ -6070,7 +6075,7 @@ CONFIG_PATA_HPT3X3=y
60706075
CONFIG_PATA_IT8213=y
60716076
CONFIG_PATA_IT821X=y
60726077
CONFIG_PATA_JMICRON=y
6073-
CONFIG_PATA_LEGACY=y
6078+
# CONFIG_PATA_LEGACY is not set
60746079
CONFIG_PATA_MARVELL=y
60756080
CONFIG_PATA_MPIIX=y
60766081
CONFIG_PATA_NETCELL=y
@@ -7138,8 +7143,8 @@ CONFIG_RUSTC_HAS_FILE_WITH_NUL=y
71387143
CONFIG_RUSTC_HAS_SPAN_FILE=y
71397144
CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
71407145
CONFIG_RUSTC_LLVM_VERSION=200108
7141-
CONFIG_RUSTC_VERSION=109100
7142-
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.0 (f8297e351 2025-10-28) (built from a source tarball)"
7146+
CONFIG_RUSTC_VERSION=109101
7147+
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.1 (ed61e7d7e 2025-11-07) (built from a source tarball)"
71437148
# CONFIG_RUST_DEBUG_ASSERTIONS is not set
71447149
CONFIG_RUST_FW_LOADER_ABSTRACTIONS=y
71457150
CONFIG_RUST_IS_AVAILABLE=y

‎runtime-kernel/linux-kernel-rc/autobuild/loongarch64/config.4k‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,14 +2424,15 @@ CONFIG_EFI_ESRT=y
24242424
CONFIG_EFI_GENERIC_STUB=y
24252425
CONFIG_EFI_PARTITION=y
24262426
CONFIG_EFI_RUNTIME_WRAPPERS=y
2427+
CONFIG_EFI_SBAT_FILE=""
24272428
CONFIG_EFI_SOFT_RESERVE=y
24282429
CONFIG_EFI_STUB=y
24292430
CONFIG_EFI_TEST=m
24302431
CONFIG_EFIVAR_FS=y
24312432
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
24322433
CONFIG_EFI_VARS_PSTORE=y
24332434
CONFIG_EFI=y
2434-
# CONFIG_EFI_ZBOOT is not set
2435+
CONFIG_EFI_ZBOOT=y
24352436
CONFIG_EFS_FS=m
24362437
CONFIG_ELF_CORE=y
24372438
CONFIG_ELFCORE=y
@@ -3113,6 +3114,8 @@ CONFIG_HAVE_IOREMAP_PROT=y
31133114
CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
31143115
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
31153116
CONFIG_HAVE_KCSAN_COMPILER=y
3117+
CONFIG_HAVE_KERNEL_GZIP=y
3118+
CONFIG_HAVE_KERNEL_ZSTD=y
31163119
CONFIG_HAVE_KPROBES_ON_FTRACE=y
31173120
CONFIG_HAVE_KPROBES=y
31183121
CONFIG_HAVE_KRETPROBES=y
@@ -4101,6 +4104,8 @@ CONFIG_KARMA_PARTITION=y
41014104
CONFIG_KCMP=y
41024105
# CONFIG_KCOV is not set
41034106
CONFIG_KEMPLD_WDT=m
4107+
# CONFIG_KERNEL_GZIP is not set
4108+
CONFIG_KERNEL_ZSTD=y
41044109
CONFIG_KERNFS=y
41054110
CONFIG_KEXEC_CORE=y
41064111
CONFIG_KEXEC_ELF=y
@@ -6070,7 +6075,7 @@ CONFIG_PATA_HPT3X3=y
60706075
CONFIG_PATA_IT8213=y
60716076
CONFIG_PATA_IT821X=y
60726077
CONFIG_PATA_JMICRON=y
6073-
CONFIG_PATA_LEGACY=y
6078+
# CONFIG_PATA_LEGACY is not set
60746079
CONFIG_PATA_MARVELL=y
60756080
CONFIG_PATA_MPIIX=y
60766081
CONFIG_PATA_NETCELL=y
@@ -7138,8 +7143,8 @@ CONFIG_RUSTC_HAS_FILE_WITH_NUL=y
71387143
CONFIG_RUSTC_HAS_SPAN_FILE=y
71397144
CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
71407145
CONFIG_RUSTC_LLVM_VERSION=200108
7141-
CONFIG_RUSTC_VERSION=109100
7142-
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.0 (f8297e351 2025-10-28) (built from a source tarball)"
7146+
CONFIG_RUSTC_VERSION=109101
7147+
CONFIG_RUSTC_VERSION_TEXT="rustc 1.91.1 (ed61e7d7e 2025-11-07) (built from a source tarball)"
71437148
# CONFIG_RUST_DEBUG_ASSERTIONS is not set
71447149
CONFIG_RUST_FW_LOADER_ABSTRACTIONS=y
71457150
CONFIG_RUST_IS_AVAILABLE=y

‎runtime-kernel/linux-kernel-rc/autobuild/loongson3/config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6668,7 +6668,7 @@ CONFIG_RUSTC_HAS_FILE_WITH_NUL=y
66686668
CONFIG_RUSTC_HAS_SPAN_FILE=y
66696669
CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
66706670
CONFIG_RUSTC_LLVM_VERSION=200108
6671-
CONFIG_RUSTC_VERSION=109100
6671+
CONFIG_RUSTC_VERSION=109101
66726672
CONFIG_RUST_IS_AVAILABLE=y
66736673
CONFIG_RXGK=y
66746674
CONFIG_RXKAD=y

runtime-kernel/linux-kernel-rc/autobuild/patches/0324-UPSTREAM-net-stmmac-remove-broken-PCS-code.patch renamed to runtime-kernel/linux-kernel-rc/autobuild/patches/0001-UPSTREAM-net-stmmac-remove-broken-PCS-code.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From d9f4f88272bc5047d88ce67da4740a7bd24bdeff Mon Sep 17 00:00:00 2001
1+
From c15aae97301f021071770ba04fd45e992136dcfa Mon Sep 17 00:00:00 2001
22
From: "Russell King (Oracle)" <[email protected]>
33
Date: Thu, 16 Oct 2025 15:36:46 +0100
4-
Subject: [PATCH 324/348] UPSTREAM: net: stmmac: remove broken PCS code
4+
Subject: [PATCH 001/391] UPSTREAM: net: stmmac: remove broken PCS code
55

66
Changing the netif_carrier_*() state behind phylink's back has always
77
been prohibited because it messes up with phylinks state tracking, and
@@ -245,10 +245,10 @@ index 39fa1ec92f82..d89662b48087 100644
245245
}
246246

247247
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
248-
index e0bc5c4d93ff..69172d08c9bb 100644
248+
index 7b90ecd3a55e..9e503bafee08 100644
249249
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
250250
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
251-
@@ -6010,15 +6010,6 @@ static void stmmac_common_interrupt(struct stmmac_priv *priv)
251+
@@ -5999,15 +5999,6 @@ static void stmmac_common_interrupt(struct stmmac_priv *priv)
252252
for (queue = 0; queue < queues_count; queue++)
253253
stmmac_host_mtl_irq_status(priv, priv->hw, queue);
254254

@@ -277,5 +277,5 @@ index fa1318bac06c..99022620457a 100644
277277
#define STMMAC_FLAG_USE_PHY_WOL BIT(2)
278278
#define STMMAC_FLAG_HAS_SUN8I BIT(3)
279279
--
280-
2.51.2
280+
2.52.0
281281

runtime-kernel/linux-kernel-rc/autobuild/patches/0325-UPSTREAM-net-stmmac-remove-xstats.pcs_-members.patch renamed to runtime-kernel/linux-kernel-rc/autobuild/patches/0002-UPSTREAM-net-stmmac-remove-xstats.pcs_-members.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 4d92c6b79aba8263168e6385b01adffe6eb0aef9 Mon Sep 17 00:00:00 2001
1+
From d6607b09a9940edbea2ff5514a5dd22f7c026c7a Mon Sep 17 00:00:00 2001
22
From: "Russell King (Oracle)" <[email protected]>
33
Date: Thu, 16 Oct 2025 15:36:51 +0100
4-
Subject: [PATCH 325/348] UPSTREAM: net: stmmac: remove xstats.pcs_* members
4+
Subject: [PATCH 002/391] UPSTREAM: net: stmmac: remove xstats.pcs_* members
55

66
As a result of the previous commit, the pcs_link, pcs_duplex and
77
pcs_speed members are not used outside of the interrupt handling code,
@@ -27,7 +27,7 @@ Signed-off-by: Mingcong Bai <[email protected]>
2727
3 files changed, 2 insertions(+), 57 deletions(-)
2828

2929
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
30-
index 0804009dcc59..302ef8c2f5c5 100644
30+
index 8f34c9ad457f..33aeac5666f4 100644
3131
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
3232
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
3333
@@ -192,9 +192,6 @@ struct stmmac_extra_stats {
@@ -121,5 +121,5 @@ index d85bc0bb5c3c..8a19df7b0577 100644
121121

122122
static int dwmac4_irq_mtl_status(struct stmmac_priv *priv,
123123
--
124-
2.51.2
124+
2.52.0
125125

runtime-kernel/linux-kernel-rc/autobuild/patches/0326-UPSTREAM-net-stmmac-remove-SGMII-RGMII-SMII-interrup.patch renamed to runtime-kernel/linux-kernel-rc/autobuild/patches/0003-UPSTREAM-net-stmmac-remove-SGMII-RGMII-SMII-interrup.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 4a41ed76739306985d30c3ce94e5dd6413a95ae9 Mon Sep 17 00:00:00 2001
1+
From 002b5cc0367ddbd4f17f7cf0d06de4fcf8bb21fc Mon Sep 17 00:00:00 2001
22
From: "Russell King (Oracle)" <[email protected]>
33
Date: Thu, 16 Oct 2025 15:36:56 +0100
4-
Subject: [PATCH 326/348] UPSTREAM: net: stmmac: remove SGMII/RGMII/SMII
4+
Subject: [PATCH 003/391] UPSTREAM: net: stmmac: remove SGMII/RGMII/SMII
55
interrupt handling
66

77
Now that the only use for the interrupt is to clear it and increment a
@@ -116,5 +116,5 @@ index 8a19df7b0577..bff4c371c1d2 100644
116116
return ret;
117117
}
118118
--
119-
2.51.2
119+
2.52.0
120120

runtime-kernel/linux-kernel-rc/autobuild/patches/0327-UPSTREAM-net-stmmac-remove-PCS-mode-pause-handling.patch renamed to runtime-kernel/linux-kernel-rc/autobuild/patches/0004-UPSTREAM-net-stmmac-remove-PCS-mode-pause-handling.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From b45ddfcafae15ece5baeaceb48a8f2ab848df126 Mon Sep 17 00:00:00 2001
1+
From 1c085d76ad2e8d7b54eef4948179810ea6a8a00f Mon Sep 17 00:00:00 2001
22
From: "Russell King (Oracle)" <[email protected]>
33
Date: Thu, 16 Oct 2025 15:37:01 +0100
4-
Subject: [PATCH 327/348] UPSTREAM: net: stmmac: remove PCS "mode" pause
4+
Subject: [PATCH 004/391] UPSTREAM: net: stmmac: remove PCS "mode" pause
55
handling
66

77
Remove the "we always autoneg pause" forcing when the stmmac driver
@@ -57,5 +57,5 @@ index d89662b48087..c60cd948311e 100644
5757

5858
static u64 stmmac_get_rx_normal_irq_n(struct stmmac_priv *priv, int q)
5959
--
60-
2.51.2
60+
2.52.0
6161

runtime-kernel/linux-kernel-rc/autobuild/patches/0328-UPSTREAM-net-stmmac-remove-unused-PCS-loopback-suppo.patch renamed to runtime-kernel/linux-kernel-rc/autobuild/patches/0005-UPSTREAM-net-stmmac-remove-unused-PCS-loopback-suppo.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 6e97d2088756089e832c58b4b866f9ab77cb37e4 Mon Sep 17 00:00:00 2001
1+
From f14c906aefd98e4a9a573602925210e0f4cf320c Mon Sep 17 00:00:00 2001
22
From: "Russell King (Oracle)" <[email protected]>
33
Date: Thu, 16 Oct 2025 15:37:06 +0100
4-
Subject: [PATCH 328/348] UPSTREAM: net: stmmac: remove unused PCS loopback
4+
Subject: [PATCH 005/391] UPSTREAM: net: stmmac: remove unused PCS loopback
55
support
66

77
Nothing calls stmmac_pcs_ctrl_ane() with the "loopback" argument set to
@@ -88,10 +88,10 @@ index 14dbe0685997..7796f5f3c96f 100644
8888
int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp,
8989
struct stmmac_safety_feature_cfg *safety_cfg);
9090
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
91-
index 69172d08c9bb..e15888ac71a7 100644
91+
index 9e503bafee08..0e8b19be907e 100644
9292
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
9393
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
94-
@@ -3504,7 +3504,7 @@ static int stmmac_hw_setup(struct net_device *dev)
94+
@@ -3493,7 +3493,7 @@ static int stmmac_hw_setup(struct net_device *dev)
9595
}
9696

9797
if (priv->hw->pcs)
@@ -130,5 +130,5 @@ index 4a684c97dfae..5778f5b2f313 100644
130130
}
131131
#endif /* __STMMAC_PCS_H__ */
132132
--
133-
2.51.2
133+
2.52.0
134134

0 commit comments

Comments
 (0)