| commit | 0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Nov 26 23:42:21 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sat Nov 26 23:42:21 2016 -0500 |
| tree | 77856ad061e97e86027df1fa6efdf20a9fe309b5 | |
| parent | e5f12b3f5ebb8a6ffd3864a04f687ea0ef78a48a [diff] | |
| parent | d8e435f3ab6fea2ea324dce72b51dd7761747523 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>