Patchwork [GIT,PULL,net-next,v2] IPVS

login
register
mail settings
Submitter Simon Horman
Date May 2, 2012, 6:22 a.m.
Message ID <1335939762-1912-1-git-send-email-horms@verge.net.au>
Download mbox
Permalink /patch/156341/
State Accepted
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git master

Comments

Simon Horman - May 2, 2012, 6:22 a.m.
Hi Pablo,

please consider the following 18 changes for 3.5.

This replaces a 17 patch pull request that I sent earlier today by adding a
patch from Hans patch to the head of the request.  You should be able to
just pull again if you have already pulled the original series and not
applied anything else on top.

Please note that there will be a conflict with the following when merged
with net-next due to the following change which is already present in
David's tree. It should be a trivial merge but please let me know if you
want to handle this another way.

	4a17fd5 sock: Introduce named constants for sk_reuse

The following changes since commit c3dc836d807a9b9855eefe535fdcbcf7cbb7a574:

  netfilter: bridge: optionally set indev to vlan (2012-04-24 01:22:44 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git master

for you to fetch changes up to 3de4b8ca4ffa3dafaeef985fabe152a1717a8ea0:

  export sysctl symbols needed by ip_vs_sync (2012-05-02 14:48:55 +0900)

----------------------------------------------------------------
H Hartley Sweeten (2):
      IPVS: ip_vs_ftp.c: local functions should not be exposed globally
      IPVS: ip_vs_proto.c: local functions should not be exposed globally

Hans Schillstrom (1):
      export sysctl symbols needed by ip_vs_sync

Julian Anastasov (14):
      ipvs: timeout tables do not need GFP_ATOMIC allocation
      ipvs: LBLC scheduler does not need GFP_ATOMIC allocation on init
      ipvs: DH scheduler does not need GFP_ATOMIC allocation
      ipvs: WRR scheduler does not need GFP_ATOMIC allocation
      ipvs: LBLCR scheduler does not need GFP_ATOMIC allocation on init
      ipvs: SH scheduler does not need GFP_ATOMIC allocation
      ipvs: ignore IP_VS_CONN_F_NOOUTPUT in backup server
      ipvs: remove check for IP_VS_CONN_F_SYNC from ip_vs_bind_dest
      ipvs: fix ip_vs_try_bind_dest to rebind app and transmitter
      ipvs: always update some of the flags bits in backup
      ipvs: wakeup master thread
      ipvs: reduce sync rate with time thresholds
      ipvs: add support for sync threads
      ipvs: optimize the use of flags in ip_vs_bind_dest

Sasha Levin (1):
      netfilter: ipvs: use GFP_KERNEL allocation where possible

 include/linux/ip_vs.h            |    5 +
 include/net/ip_vs.h              |   87 ++++-
 net/core/sock.c                  |    2 +
 net/netfilter/ipvs/ip_vs_conn.c  |   69 ++--
 net/netfilter/ipvs/ip_vs_core.c  |   30 +-
 net/netfilter/ipvs/ip_vs_ctl.c   |   70 +++-
 net/netfilter/ipvs/ip_vs_dh.c    |    2 +-
 net/netfilter/ipvs/ip_vs_ftp.c   |    2 +-
 net/netfilter/ipvs/ip_vs_lblc.c  |    2 +-
 net/netfilter/ipvs/ip_vs_lblcr.c |    2 +-
 net/netfilter/ipvs/ip_vs_proto.c |    6 +-
 net/netfilter/ipvs/ip_vs_sh.c    |    2 +-
 net/netfilter/ipvs/ip_vs_sync.c  |  662 ++++++++++++++++++++++++++------------
 net/netfilter/ipvs/ip_vs_wrr.c   |    2 +-
 14 files changed, 669 insertions(+), 274 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira - May 6, 2012, 9:56 p.m.
Hi Simon,

On Wed, May 02, 2012 at 03:22:24PM +0900, Simon Horman wrote:
> Hi Pablo,
> 
> please consider the following 18 changes for 3.5.
> 
> This replaces a 17 patch pull request that I sent earlier today by adding a
> patch from Hans patch to the head of the request.  You should be able to
> just pull again if you have already pulled the original series and not
> applied anything else on top.
> 
> Please note that there will be a conflict with the following when merged
> with net-next due to the following change which is already present in
> David's tree. It should be a trivial merge but please let me know if you
> want to handle this another way.
> 
> 	4a17fd5 sock: Introduce named constants for sk_reuse
> 
> The following changes since commit c3dc836d807a9b9855eefe535fdcbcf7cbb7a574:
> 
>   netfilter: bridge: optionally set indev to vlan (2012-04-24 01:22:44 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git master

Pulled, thanks.

I have fixed some minor glitches, see below.

> for you to fetch changes up to 3de4b8ca4ffa3dafaeef985fabe152a1717a8ea0:
> 
>   export sysctl symbols needed by ip_vs_sync (2012-05-02 14:48:55 +0900)
> 
> ----------------------------------------------------------------
> H Hartley Sweeten (2):
>       IPVS: ip_vs_ftp.c: local functions should not be exposed globally
>       IPVS: ip_vs_proto.c: local functions should not be exposed globally
        ^^^^
Please, use consistent tagging across patches (sometimes this is in
uppercase, sometimes lowercase).

I think using the same tagging is good for grepping for changes.

I have also removed the CC tag to David Miller in those two patches
above from H. Hartely, they are not useful anymore.

> Hans Schillstrom (1):
>       export sysctl symbols needed by ip_vs_sync
     ^^^

This one missed "net: " or "sock: " tag in the beginnging. I added
"net: " here.

I have manually fixed this, but you'll have to rebase your tree, sorry.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html