|
Hi Dave,
Please let me know if this is inappropriate or I am doing things wrong.
This should pull straight into net-next.2.6. The master branch is still
based on net-2.6 and also contains all of these changesets (less the last
trivial merge).
The following changes since commit a4356b2920fd4861dd6c75f558749fa5c38a00e8:
lpo Järvinen (1):
tcp: Add tcp_parse_aligned_timestamp
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6.git lvs-next-2.6
Julius Volz (4):
IPVS: Add genetlink interface definitions to ip_vs.h
IPVS: Add genetlink interface implementation
IPVS: Integrate ESP protocol into ip_vs_proto_ah.c
IPVS: Rename ip_vs_proto_ah.c to ip_vs_proto_ah_esp.c
Simon Horman (4):
ipvs: rename __ip_vs_wlc_schedule in lblc and lblcr schedulers
Merge branch 'master' of git://git.kernel.org/.../davem/net-2.6
Merge branch 'master' of git://git.kernel.org/.../davem/net-2.6
Merge branch 'master' of git://git.kernel.org/.../horms/lvs-2.6 into
lvs-next-2.6
Sven Wegener (4):
ipvs: Only call init_service, update_service and done_service for
schedulers if defined
ipvs: Create init functions for estimator code
ipvs: Fix race conditions in lblc scheduler
ipvs: Fix race conditions in lblcr scheduler
include/linux/ip_vs.h | 160 +++++++
include/net/ip_vs.h | 2
net/ipv4/ipvs/ip_vs_core.c | 8
net/ipv4/ipvs/ip_vs_ctl.c | 896 ++++++++++++++++++++++++++++++++++++++++++-
net/ipv4/ipvs/ip_vs_est.c | 18
net/ipv4/ipvs/ip_vs_lblc.c | 213 ++++------
net/ipv4/ipvs/ip_vs_lblcr.c | 238 +++++------
net/ipv4/ipvs/ip_vs_lc.c | 21 -
net/ipv4/ipvs/ip_vs_nq.c | 24 -
net/ipv4/ipvs/ip_vs_rr.c | 7
net/ipv4/ipvs/ip_vs_sed.c | 24 -
net/ipv4/ipvs/ip_vs_wlc.c | 24 -
12 files changed, 1278 insertions(+), 357 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
