diff options
| author | David S. Miller <[email protected]> | 2016-11-27 04:42:21 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-11-27 04:42:21 +0000 |
| commit | 0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe (patch) | |
| tree | 77856ad061e97e86027df1fa6efdf20a9fe309b5 /net/tipc/core.c | |
| parent | Merge branch 'mlxsw-trap-groups-and-policers' (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | kernel-0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe.tar.gz kernel-0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe.zip | |
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 <[email protected]>
Diffstat (limited to 'net/tipc/core.c')
0 files changed, 0 insertions, 0 deletions