| author | David S. Miller <davem@davemloft.net> | |
| Sun, 17 Mar 2013 16:58:47 +0000 (12:58 -0400) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Sun, 17 Mar 2013 16:58:47 +0000 (12:58 -0400) | ||
| commit | 86feff3f3eb643cc5735d414e46a8201a8c67b8f | |
| tree | 45e344303aec36f5c30456e0c7f3c38161ace7a5 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 1f9061d27d3d2028805549c4a306324a48209057 | commit | diff |
| parent | 4490108b4a5ada14c7be712260829faecc814ae5 | commit | diff |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Conflicts:
net/openvswitch/vport-internal_dev.c
Jesse Gross says:
====================
A couple of minor enhancements for net-next/3.10. The largest is an
extension to allow variable length metadata to be passed to userspace
with packets.
There is a merge conflict in net/openvswitch/vport-internal_dev.c:
A existing commit modifies internal_dev_mac_addr() and a new commit
deletes it. The new one is correct, so you can just remove that function.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Conflicts:
net/openvswitch/vport-internal_dev.c
Jesse Gross says:
====================
A couple of minor enhancements for net-next/3.10. The largest is an
extension to allow variable length metadata to be passed to userspace
with packets.
There is a merge conflict in net/openvswitch/vport-internal_dev.c:
A existing commit modifies internal_dev_mac_addr() and a new commit
deletes it. The new one is correct, so you can just remove that function.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| net/openvswitch/datapath.c | diff1 | | diff2 | | blob | history |
| net/openvswitch/vport-internal_dev.c | diff1 | | diff2 | | blob | history |