git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sat, 24 Oct 2015 13:54:12 +0000 (06:54 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sat, 24 Oct 2015 13:54:12 +0000 (06:54 -0700)
commit	d177ddd96e9f0aa5d9a380638a2d95feaeaa4717
tree	36b99da43ee72f81b31f0627dbfc69f50c97378f	tree \| snapshot
parent	2d177f157942673ac13896458a02a247bc12dfcf	commit \| diff
parent	f488dbc25a74ade33f4422955c7c0f4050dd9ce8	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/ipv6/xfrm6_output.c
net/openvswitch/flow_netlink.c
net/openvswitch/vport-gre.c
net/openvswitch/vport-vxlan.c
net/openvswitch/vport.c
net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes. One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>

37 files changed:

Documentation/devicetree/bindings/net/cpsw.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcm63xx_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/openvswitch.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_rpfilter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/xfrm4_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_policy.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/core.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/actions.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/conntrack.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/flow_netlink.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-geneve.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-gre.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-internal_dev.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-vxlan.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport.h	diff1 \|	diff2 \|	blob \| history
net/tipc/msg.c	diff1 \|	diff2 \|	blob \| history
net/tipc/udp_media.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Documentation/devicetree/bindings/net/cpsw.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcm63xx_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/openvswitch.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_rpfilter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/xfrm4_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_policy.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/core.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/actions.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/conntrack.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/flow_netlink.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-geneve.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-gre.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-internal_dev.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-vxlan.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport.h	diff1 \|	diff2 \|	blob \| history
net/tipc/msg.c	diff1 \|	diff2 \|	blob \| history
net/tipc/udp_media.c	diff1 \|	diff2 \|	blob \| history