aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python/export-to-sqlite.py
diff options
context:
space:
mode:
authorAntonio Borneo <[email protected]>2020-11-24 23:37:29 +0100
committerJakub Kicinski <[email protected]>2020-11-25 11:23:40 -0800
commit12a8fe56c0f06eaab1f9d89d246c3591bcc7a966 (patch)
tree4b28e555207f5ff9fb1691be451c7b8105e08bbe /tools/perf/scripts/python/export-to-sqlite.py
parente255e11e66da8281e337e4e352956e8a4999fca4 (diff)
net: stmmac: fix incorrect merge of patch upstream
Commit 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a") was intended to modify the struct dwmac410_ops, but it got somehow badly merged and modified the struct dwmac4_ops. Revert the modification in struct dwmac4_ops and re-apply it properly in struct dwmac410_ops. Fixes: 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a") Signed-off-by: Antonio Borneo <[email protected]> Reported-by: Ahmad Fatoum <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions