diff options
| author | David S. Miller | 2012-11-30 18:01:30 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-11-30 18:01:30 +0100 |
| commit | e7165030db8e932a9a968f7015cd3b2e984f8e7c (patch) | |
| tree | ab46a0baf25f72b7001bb4673ba47534b81a0d2d /drivers/net/bonding | |
| parent | core: make GRO methods static. (diff) | |
| parent | openvswitch: Use RCU callback when detaching netdevices. (diff) | |
| download | kernel-qcow2-linux-e7165030db8e932a9a968f7015cd3b2e984f8e7c.tar.gz kernel-qcow2-linux-e7165030db8e932a9a968f7015cd3b2e984f8e7c.tar.xz kernel-qcow2-linux-e7165030db8e932a9a968f7015cd3b2e984f8e7c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Conflicts:
net/ipv6/exthdrs_core.c
Jesse Gross says:
====================
This series of improvements for 3.8/net-next contains four components:
* Support for modifying IPv6 headers
* Support for matching and setting skb->mark for better integration with
things like iptables
* Ability to recognize the EtherType for RARP packets
* Two small performance enhancements
The movement of ipv6_find_hdr() into exthdrs_core.c causes two small merge
conflicts. I left it as is but can do the merge if you want. The conflicts
are:
* ipv6_find_hdr() and ipv6_find_tlv() were both moved to the bottom of
exthdrs_core.c. Both should stay.
* A new use of ipv6_find_hdr() was added to net/netfilter/ipvs/ip_vs_core.c
after this patch. The IPVS user has two instances of the old constant
name IP6T_FH_F_FRAG which has been renamed to IP6_FH_F_FRAG.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
0 files changed, 0 insertions, 0 deletions