]> git.karo-electronics.de Git - linux-beck.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2015 22:33:28 +0000 (14:33 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2015 22:33:28 +0000 (14:33 -0800)
commit6e03f896b52cd2ca88942170c5c9c407ec0ede69
tree48ca9a6efa5f99819667538838bab3679416f92c
parentdb79a621835ee91d3e10177abd97f48e0a4dcf9b
parent9d82f5eb3376cbae96ad36a063a9390de1694546
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>
36 files changed:
MAINTAINERS
drivers/net/ethernet/amd/Kconfig
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
drivers/net/ethernet/intel/igbvf/netdev.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
drivers/net/ethernet/qlogic/qlge/qlge_main.c
drivers/net/ethernet/sun/sunvnet.c
drivers/net/hyperv/netvsc.c
drivers/net/macvtap.c
drivers/net/tun.c
drivers/net/virtio_net.c
drivers/net/vxlan.c
drivers/net/xen-netback/netback.c
drivers/vhost/net.c
include/linux/if_vlan.h
include/linux/mlx4/device.h
include/net/ip.h
include/net/ipv6.h
include/net/netns/ipv4.h
include/net/tcp.h
net/core/dev.c
net/core/rtnetlink.c
net/ipv4/ip_output.c
net/ipv4/route.c
net/ipv4/tcp_cong.c
net/ipv4/tcp_ipv4.c
net/ipv6/ip6_gre.c
net/ipv6/ip6_output.c
net/ipv6/sit.c
net/netfilter/nf_tables_api.c
net/netlink/af_netlink.c
net/sched/sch_fq.c