Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dpaa2-eth: fix wrong merge conflict resolution #89

Merged
merged 1 commit into from
Jul 9, 2020
Merged

dpaa2-eth: fix wrong merge conflict resolution #89

merged 1 commit into from
Jul 9, 2020

Commits on Jul 9, 2020

  1. dpaa2-eth: fix wrong merge conflict resolution 

    When merging
    d1a00c9 dpaa2-eth: fix return codes used in ndo_setup_tc
with update to Linux 5.4.48, wrong resolution for fixing merge conflict
in dpaa2-eth.c was chosen.

This fixes the resulting error.

Signed-off-by: Jens Rehsack <sno@netbsd.org>
    @rehsack
    rehsack committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    c34b53c View commit details
    Browse the repository at this point in the history