[ovs-dev] [GIT net] Open vSwitch

[Jesse Gross]

Three bug fixes that are fairly small either way but resolve obviously
incorrect code. For net/3.11.

The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:

  Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git fixes

for you to fetch changes up to 36bf5cc66d60868bcc10aff209defed5a7b71c1d:

  openvswitch: Reset tunnel key between input and output. (2013-08-14 15:50:36 -0700)

----------------------------------------------------------------
Jesse Gross (2):
      openvswitch: Fix bad merge resolution.
      openvswitch: Reset tunnel key between input and output.

Pravin B Shelar (1):
      openvswitch: Use correct type while allocating flex array.

 net/openvswitch/actions.c  | 1 +
 net/openvswitch/datapath.c | 3 ---
 net/openvswitch/flow.c     | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)