Here's the most recent set of changes that I think are appropriate
to cherry-pick to branch-1.1. They apply cleanly, without any
merge errors.
I considered only changes that are already on master following commit
6f04e94a264edae76aa2bb44a9019e19b29d47a1 "datapath: Avoid freeing wild
pointer in corner case" because that commit was the last one cherry-picked
to branch-1.1. You can see a list of the candidate commits by running:
gitk origin/master ^6f04e94a264edae76aa2bb44a9019e19b29d47a1
and then compare it to the ones that I selected.
Since these are already on master, it's only necessary to decide whether
you agree that they are the correct commits to cherry-pick.
Ben Pfaff (3):
xenserver: Use .../extra not .../kernel/extra for kernel modules.
xenserver: Don't remove network.dbcache on uninstall.
ofp-util: Fix validation of OFPAT_SET_VLAN_PCP actions.
Ethan Jackson (2):
dpif-linux: Recycle leaked ports.
bridge: Don't configure QoS without Queues.
Justin Pettit (1):
xenserver: Use xe-switch-network-stack in RPM spec file.
AUTHORS | 1 +
lib/dpif-linux.c | 24 +++++++++++++++++++++++-
lib/ofp-util.c | 2 +-
vswitchd/bridge.c | 2 +-
xenserver/openvswitch-xen.spec | 23 ++++++-----------------
5 files changed, 32 insertions(+), 20 deletions(-)
--
1.7.4.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
