Skip to content
Commit 9bd4d2b0 authored by Kevin Hao's avatar Kevin Hao Committed by Bruce Ashfield
Browse files

net: ethernet: ti: am65-cpsw: Fix the incorrect resolution when merging v5.15.157



There is only one simple commit 83115775 ("net: ethernet: ti:
am65-cpsw-nuss: cleanup DMA Channels before using them") which touched
drivers/net/ethernet/ti/am65-cpsw-nuss.c between v5.15.156 and
v5.15.157. But when merging of v5.15.157, some unrelated changes
slipped in, while the changes in 83115775 were lost. Drop all the
unrelated changes and restore the commit 83115775 back.

Signed-off-by: default avatarKevin Hao <kexin.hao@windriver.com>
Signed-off-by: default avatarBruce Ashfield <bruce.ashfield@gmail.com>
parent cfa3d0d7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment