diff options
| author | Antonio Borneo <antonio.borneo@st.com> | 2020-11-24 23:37:29 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-25 11:23:40 -0800 |
| commit | 12a8fe56c0f06eaab1f9d89d246c3591bcc7a966 (patch) | |
| tree | 4b28e555207f5ff9fb1691be451c7b8105e08bbe /scripts/gcc-plugins/randomize_layout_plugin.c | |
| parent | e255e11e66da8281e337e4e352956e8a4999fca4 (diff) | |
| download | linux-12a8fe56c0f06eaab1f9d89d246c3591bcc7a966.tar.gz linux-12a8fe56c0f06eaab1f9d89d246c3591bcc7a966.tar.bz2 linux-12a8fe56c0f06eaab1f9d89d246c3591bcc7a966.zip | |
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 <antonio.borneo@st.com>
Reported-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.kernel.org/r/20201124223729.886992-1-antonio.borneo@st.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'scripts/gcc-plugins/randomize_layout_plugin.c')
0 files changed, 0 insertions, 0 deletions