diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-05 23:33:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-05 23:33:28 +0100 |
| commit | 6e03f896b52cd2ca88942170c5c9c407ec0ede69 (patch) | |
| tree | 48ca9a6efa5f99819667538838bab3679416f92c /block/bio.c | |
| parent | vxlan: Only set has-GBP bit in header if any other bits would be set (diff) | |
| parent | MMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-6e03f896b52cd2ca88942170c5c9c407ec0ede69.tar.xz linux-6e03f896b52cd2ca88942170c5c9c407ec0ede69.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 'block/bio.c')
0 files changed, 0 insertions, 0 deletions