diff options
author | David S. Miller <davem@davemloft.net> | 2022-07-15 12:06:56 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2022-07-15 12:06:56 +0100 |
commit | 8f3184b951164131a8b35770f225082cc02008be (patch) | |
tree | 0c2d8b2e1ea8a6e6aa5763bd0526613e5782641b /net/ipv6/tcp_ipv6.c | |
parent | 782d86fe44e38c0a02e92042fff2ce417d62c61a (diff) | |
parent | f4c7d8948e866918d61493264dbbd67e45ef2bda (diff) | |
download | linux-8f3184b951164131a8b35770f225082cc02008be.tar.gz linux-8f3184b951164131a8b35770f225082cc02008be.tar.bz2 linux-8f3184b951164131a8b35770f225082cc02008be.zip |
Merge branch 'stmmac-dwmac-mediatec-clock-fix'
Biao Huang says:
====================
stmmac: dwmac-mediatek: fix clock issue
changes in v5:
1. add reivewd-by as Matthias's comments.
2. fix "warning: unused variable 'ret' [-Wunused-variable]" as Jakub's comments
changes in v4:
1. improve commit message and test ko insertion/remove as Matthias's comments.
2. add patch "net: stmmac: fix pm runtime issue in stmmac_dvr_remove()" to
fix vlan filter deletion issue.
3. add patch "net: stmmac: fix unbalanced ptp clock issue in suspend/resume flow"
to fix unbalanced ptp clock issue in suspend/resume flow.
changes in v3:
1. delete mediatek_dwmac_exit() since there is no operation in it,
as Matthias's comments.
changes in v2:
1. clock configuration is still needed in probe,
and invoke mediatek_dwmac_clks_config() instead.
2. update commit message.
v1:
remove duplicated clock configuration in init/exit.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions