From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Simon Horman <horms@verge.net.au>
Cc: netfilter-devel@vger.kernel.org, lvs-devel@vger.kernel.org,
netdev@vger.kernel.org, Patrick McHardy <kaber@trash.net>,
Julian Anastasov <ja@ssi.bg>,
Hans Schillstrom <hans.schillstrom@ericsson.com>
Subject: Re: [PATCH 00/22] ipvs namespaces v3.3
Date: Thu, 13 Jan 2011 12:11:12 +0100 [thread overview]
Message-ID: <4D2EDDD0.8060903@netfilter.org> (raw)
In-Reply-To: <1294883588-5683-1-git-send-email-horms@verge.net.au>
On 13/01/11 02:52, Simon Horman wrote:
> Hi Pablo,
>
> this changest includes the following changes since the v3.2 series
> which was most recently posted as "[GIT PULL nf-next-2.6] ipvs namespaces".
>
> * Remove several hunks that only make whitespace changes
Thanks a lot for doing this.
> * Add Acked-by: Julian Anastasov <ja@ssi.bg>
> (It was an omission from v3.2)
> * Fix merge conflicts
>
> There are two changes that produce conflicts
> * In the current net-next-2.6 tree but absent from the current nf-next-2.6 tree
> there is "workqueue: convert
> cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()"
> * And in the current nf-next-2.6 tree but absent from the current
> net-next-2.6 tree there is "net: use the macros defined for the members
> of flowi"
nf-*-2.6 are Patrick's trees. My trees are here:
http://1984.lsi.us.es/git/
> In order to create this series I merged net-next-2.6 into nf-next-2.6.
> The result is at
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6 ipvs-netns3.3
>
> However, I guess that you have already done your own merge and simply
> pulling the branch above will create a bit of a mess. Please let me know
> if you have a tree/branch that I should use as a base for a pull request.
I have pulled it, everything was fine. Thanks Simon!
next prev parent reply other threads:[~2011-01-13 11:11 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-13 1:52 [PATCH 00/22] ipvs namespaces v3.3 Simon Horman
2011-01-13 1:52 ` [PATCH 01/22] IPVS: netns, add basic init per netns Simon Horman
2011-01-13 1:52 ` [PATCH 02/22] IPVS: netns to services part 1 Simon Horman
2011-01-13 1:52 ` [PATCH 03/22] IPVS: netns awarness to lblcr sheduler Simon Horman
2011-01-13 1:52 ` [PATCH 04/22] IPVS: netns awarness to lblc sheduler Simon Horman
2011-01-13 1:52 ` [PATCH 05/22] IPVS: netns, prepare protocol Simon Horman
2011-01-13 1:52 ` [PATCH 06/22] IPVS: netns preparation for proto_tcp Simon Horman
2011-01-13 1:52 ` [PATCH 07/22] IPVS: netns preparation for proto_udp Simon Horman
2011-01-13 1:52 ` [PATCH 08/22] IPVS: netns preparation for proto_sctp Simon Horman
2011-01-13 1:52 ` [PATCH 09/22] IPVS: netns preparation for proto_ah_esp Simon Horman
2011-01-13 1:52 ` [PATCH 10/22] IPVS: netns, use ip_vs_proto_data as param Simon Horman
2011-01-13 1:52 ` [PATCH 11/22] IPVS: netns, common protocol changes and use of appcnt Simon Horman
2011-01-13 1:52 ` [PATCH 12/22] IPVS: netns awareness to ip_vs_app Simon Horman
2011-01-13 1:52 ` [PATCH 13/22] IPVS: netns awareness to ip_vs_est Simon Horman
2011-01-13 1:53 ` [PATCH 14/22] IPVS: netns awareness to ip_vs_sync Simon Horman
2011-01-13 1:53 ` [PATCH 15/22] IPVS: netns, ip_vs_stats and its procfs Simon Horman
2011-01-13 1:53 ` [PATCH 16/22] IPVS: netns, connection hash got net as param Simon Horman
2011-01-13 1:53 ` [PATCH 17/22] IPVS: netns, ip_vs_ctl local vars moved to ipvs struct Simon Horman
2011-01-13 1:53 ` [PATCH 18/22] IPVS: netns, defense work timer Simon Horman
2011-01-13 1:53 ` [PATCH 19/22] IPVS: netns, trash handling Simon Horman
2011-01-13 1:53 ` [PATCH 20/22] IPVS: netns, svc counters moved in ip_vs_ctl,c Simon Horman
2011-01-13 1:53 ` [PATCH 21/22] IPVS: netns, misc init_net removal in core Simon Horman
2011-01-13 1:53 ` [PATCH 22/22] IPVS: netns, final patch enabling network name space Simon Horman
2011-01-13 11:11 ` Pablo Neira Ayuso [this message]
2011-01-13 11:31 ` [PATCH 00/22] ipvs namespaces v3.3 Patrick McHardy
2011-01-13 12:16 ` Pablo Neira Ayuso
2011-01-14 13:26 ` Patrick McHardy
2011-01-13 13:18 ` Simon Horman
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=4D2EDDD0.8060903@netfilter.org \
--to=pablo@netfilter.org \
--cc=hans.schillstrom@ericsson.com \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=kaber@trash.net \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.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).