mbox

[GIT,PULL,net-next] IPVS

Message ID 1317027938-22053-1-git-send-email-horms@verge.net.au
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Pull-request

git://github.com/horms/ipvs-next.git master

Message

Simon Horman Sept. 26, 2011, 9:05 a.m. UTC
Hi,

with all the excitement of kernel.org being offline and a bunch of trees
likewise being offline I am a little unsure who should take this pull
request which is based on the current net-next tree. But I guess it should
be Patrick, Pablo or Dave.

The following changes since commit 7777de9af54a1402c79bf7663b38ff5ba308dd45:

  qlcnic: Change CDRP function (2011-09-23 14:23:59 -0400)

are available in the git repository at:
  git://github.com/horms/ipvs-next.git master

Krzysztof Wilczynski (1):
      ipvs: Expose ip_vs_ftp module parameters via sysfs.

Simon Horman (4):
      IPVS: Add documentation for new sysctl entries
      IPVS: Remove unused parameter from ip_vs_confirm_conntrack()
      IPVS: Remove unused return value of protocol state transitions
      IPVS: Removed unused variables

 Documentation/networking/ipvs-sysctl.txt |   52 +++++++++++++++++++++++++++++-
 include/net/ip_vs.h                      |   11 +++---
 net/netfilter/ipvs/ip_vs_core.c          |   13 +++----
 net/netfilter/ipvs/ip_vs_ctl.c           |    4 --
 net/netfilter/ipvs/ip_vs_ftp.c           |    5 ++-
 net/netfilter/ipvs/ip_vs_nfct.c          |    2 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c    |   14 ++------
 net/netfilter/ipvs/ip_vs_proto_tcp.c     |    6 +--
 net/netfilter/ipvs/ip_vs_proto_udp.c     |    5 +--
 net/netfilter/ipvs/ip_vs_xmit.c          |    2 +-
 10 files changed, 75 insertions(+), 39 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Pablo Neira Ayuso Sept. 27, 2011, 8:16 a.m. UTC | #1
On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> Hi,
> 
> with all the excitement of kernel.org being offline and a bunch of trees
> likewise being offline I am a little unsure who should take this pull
> request which is based on the current net-next tree. But I guess it should
> be Patrick, Pablo or Dave.

I'll try to set up one tree in one of my servers along today, I'll
send you the URI. We can use it until kernel.org comes back.

@Patrick: Contact me and I'll create one account for you so we can
access the same tree.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Sept. 28, 2011, 1:28 p.m. UTC | #2
On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > Hi,
> > 
> > with all the excitement of kernel.org being offline and a bunch of trees
> > likewise being offline I am a little unsure who should take this pull
> > request which is based on the current net-next tree. But I guess it should
> > be Patrick, Pablo or Dave.
> 
> I'll try to set up one tree in one of my servers along today, I'll
> send you the URI. We can use it until kernel.org comes back.

Thanks. Would you like me to rebase my tree on yours?

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso Sept. 28, 2011, 3:45 p.m. UTC | #3
On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > Hi,
> > > 
> > > with all the excitement of kernel.org being offline and a bunch of trees
> > > likewise being offline I am a little unsure who should take this pull
> > > request which is based on the current net-next tree. But I guess it should
> > > be Patrick, Pablo or Dave.
> > 
> > I'll try to set up one tree in one of my servers along today, I'll
> > send you the URI. We can use it until kernel.org comes back.
> 
> Thanks. Would you like me to rebase my tree on yours?

For your patches, I put them in one branch and will cherrypick them
into master.

BTW, the trees are here:

http://1984.lsi.us.es/git/?p=net/.git;a=summary
http://1984.lsi.us.es/git/?p=net-next/.git;a=summary

I'll start iterating over the list collecting patches along today.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso Sept. 28, 2011, 7:13 p.m. UTC | #4
On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > Hi,
> > > 
> > > with all the excitement of kernel.org being offline and a bunch of trees
> > > likewise being offline I am a little unsure who should take this pull
> > > request which is based on the current net-next tree. But I guess it should
> > > be Patrick, Pablo or Dave.
> > 
> > I'll try to set up one tree in one of my servers along today, I'll
> > send you the URI. We can use it until kernel.org comes back.
> 
> Thanks. Would you like me to rebase my tree on yours?

http://1984.lsi.us.es/git/?p=net-next/.git;a=shortlog;h=refs/heads/nf-next

I have added these five patches to the nf-next branch of our temporary
tree.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso Sept. 28, 2011, 9:45 p.m. UTC | #5
On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > Hi,
> > > 
> > > with all the excitement of kernel.org being offline and a bunch of trees
> > > likewise being offline I am a little unsure who should take this pull
> > > request which is based on the current net-next tree. But I guess it should
> > > be Patrick, Pablo or Dave.
> > 
> > I'll try to set up one tree in one of my servers along today, I'll
> > send you the URI. We can use it until kernel.org comes back.
> 
> Thanks. Would you like me to rebase my tree on yours?

Thinking it well, and given that you'll have to send me more patches,
I think it's a good idea if you rebase.

BTW, please no need to Cc netfilter@vger.kernel.org, that list is for
netfilter users, not for developers.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Sept. 28, 2011, 11:01 p.m. UTC | #6
On Wed, Sep 28, 2011 at 11:45:16PM +0200, Pablo Neira Ayuso wrote:
> On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> > On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > > Hi,
> > > > 
> > > > with all the excitement of kernel.org being offline and a bunch of trees
> > > > likewise being offline I am a little unsure who should take this pull
> > > > request which is based on the current net-next tree. But I guess it should
> > > > be Patrick, Pablo or Dave.
> > > 
> > > I'll try to set up one tree in one of my servers along today, I'll
> > > send you the URI. We can use it until kernel.org comes back.
> > 
> > Thanks. Would you like me to rebase my tree on yours?
> 
> Thinking it well, and given that you'll have to send me more patches,
> I think it's a good idea if you rebase.

Good thinking. I have rebased my ipvs-next tree on your nf-next branch.

> BTW, please no need to Cc netfilter@vger.kernel.org, that list is for
> netfilter users, not for developers.

Thanks, notied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html