]> code.ossystems Code Review - meta-freescale.git/commit
Code Review / meta-freescale.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 0f39479) | patch
linux-fslc-qoriq: fix merge error
authorJens Rehsack <sno@netbsd.org>
Thu, 9 Jul 2020 15:26:37 +0000 (17:26 +0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Thu, 9 Jul 2020 16:33:26 +0000 (13:33 -0300)
commit901b192ff8652236607f423386aee496e3ae2730
tree9c15a3ed5c37b974d6484f051ce57c29c3c20ab2tree | snapshot
parent0f3947982905745f053c72ea9aa678b1737c468acommit | diff
linux-fslc-qoriq: fix merge error

Fix merge error introduced while fixing conflict merging 5.4.48:
    d1a00c9bb1c7 dpaa2-eth: fix return codes used in ndo_setup_tc

Signed-off-by: Jens Rehsack <sno@netbsd.org>
recipes-kernel/linux/linux-fslc-qoriq_5.4.bb diff | blob | history