diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-05 14:33:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-05 14:33:28 -0800 |
| commit | 09079c19a2d0e249a69ab1e54925e56c4950cca1 (patch) | |
| tree | 6fdbfe3170e4f040d3b43fd2050f322434b3568d /crypto | |
| parent | a72af7c1bd53909767dfa0eae82c18ebfc90c2a4 (diff) | |
| parent | e39b1f7c2c1e0f2f0077b12287b5938206a24ea1 (diff) | |
| download | linux-crypto-09079c19a2d0e249a69ab1e54925e56c4950cca1.tar.gz linux-crypto-09079c19a2d0e249a69ab1e54925e56c4950cca1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/vxlan.c
drivers/vhost/net.c
include/linux/if_vlan.h
net/core/dev.c
The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.
In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.
In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.
In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions