diff options
| author | Doug Berger <opendmb@gmail.com> | 2017-10-26 01:04:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-26 04:14:54 +0300 |
| commit | 0d314502bbfbef7560e5a3e817722128d5c5fc5d (patch) | |
| tree | 0e83abba24396f1523f28d226dff8c6d8fa314a9 /scripts | |
| parent | 88ca59d1aaf28c25b47a9f933090e480ba6dc92a (diff) | |
| download | linux-0d314502bbfbef7560e5a3e817722128d5c5fc5d.tar.xz | |
net: bcmgenet: correct bad merge
As noted in the net-next submission for GENETv5 support [1], there
were merge conflicts with an earlier net submission [2] that had not
yet found its way to the net-next repository.
Unfortunately, when the branches were merged the conflicts were not
correctly resolved. This commit attempts to correct that.
[1] https://lkml.org/lkml/2017/3/13/1145
[2] https://lkml.org/lkml/2017/3/9/890
Fixes: 101c431492d2 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
Signed-off-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions