netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Simon Horman <horms@verge.net.au>
Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org,
	netfilter-devel@vger.kernel.org,
	Wensong Zhang <wensong@linux-vs.org>,
	Julian Anastasov <ja@ssi.bg>,
	Hans Schillstrom <hans.schillstrom@ericsson.com>,
	Jesper Dangaard Brouer <brouer@redhat.com>
Subject: Re: [GIT PULL net-next v2] IPVS
Date: Sun, 6 May 2012 23:56:32 +0200	[thread overview]
Message-ID: <20120506215632.GA22852@1984> (raw)
In-Reply-To: <1335939762-1912-1-git-send-email-horms@verge.net.au>

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.

      parent reply	other threads:[~2012-05-06 21:56 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-02  6:22 [GIT PULL net-next v2] IPVS Simon Horman
2012-05-02  6:22 ` [PATCH 01/18] ipvs: timeout tables do not need GFP_ATOMIC allocation Simon Horman
2012-05-02  6:22 ` [PATCH 02/18] ipvs: LBLC scheduler does not need GFP_ATOMIC allocation on init Simon Horman
2012-05-02  6:22 ` [PATCH 03/18] ipvs: DH scheduler does not need GFP_ATOMIC allocation Simon Horman
2012-05-02  6:22 ` [PATCH 04/18] ipvs: WRR " Simon Horman
2012-05-02  6:22 ` [PATCH 05/18] ipvs: LBLCR scheduler does not need GFP_ATOMIC allocation on init Simon Horman
2012-05-02  6:22 ` [PATCH 06/18] ipvs: SH scheduler does not need GFP_ATOMIC allocation Simon Horman
2012-05-02  6:22 ` [PATCH 07/18] netfilter: ipvs: use GFP_KERNEL allocation where possible Simon Horman
2012-05-02  6:22 ` [PATCH 08/18] ipvs: ignore IP_VS_CONN_F_NOOUTPUT in backup server Simon Horman
2012-05-02  6:22 ` [PATCH 09/18] ipvs: remove check for IP_VS_CONN_F_SYNC from ip_vs_bind_dest Simon Horman
2012-05-02  6:22 ` [PATCH 10/18] ipvs: fix ip_vs_try_bind_dest to rebind app and transmitter Simon Horman
2012-05-02  6:22 ` [PATCH 11/18] ipvs: always update some of the flags bits in backup Simon Horman
2012-05-02  6:22 ` [PATCH 12/18] ipvs: wakeup master thread Simon Horman
2012-05-02  6:22 ` [PATCH 13/18] ipvs: reduce sync rate with time thresholds Simon Horman
2012-05-02  6:22 ` [PATCH 14/18] ipvs: add support for sync threads Simon Horman
2012-05-02  6:22 ` [PATCH 15/18] ipvs: optimize the use of flags in ip_vs_bind_dest Simon Horman
2012-05-02  6:22 ` [PATCH 16/18] IPVS: ip_vs_ftp.c: local functions should not be exposed globally Simon Horman
2012-05-02  6:22 ` [PATCH 17/18] IPVS: ip_vs_proto.c: " Simon Horman
2012-05-02  6:22 ` [PATCH 18/18] export sysctl symbols needed by ip_vs_sync Simon Horman
2012-05-06 20:54   ` Pablo Neira Ayuso
2012-05-06 21:19     ` David Miller
2012-05-06 21:56 ` Pablo Neira Ayuso [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120506215632.GA22852@1984 \
    --to=pablo@netfilter.org \
    --cc=brouer@redhat.com \
    --cc=hans.schillstrom@ericsson.com \
    --cc=horms@verge.net.au \
    --cc=ja@ssi.bg \
    --cc=lvs-devel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=wensong@linux-vs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).