* [GIT PULL nf-next-2.6] IPVS
@ 2011-04-05 3:22 Simon Horman
2011-04-05 3:22 ` [PATCH] IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocks Simon Horman
2011-04-05 10:18 ` [GIT PULL nf-next-2.6] IPVS Patrick McHardy
0 siblings, 2 replies; 3+ messages in thread
From: Simon Horman @ 2011-04-05 3:22 UTC (permalink / raw)
To: lvs-devel, netdev, netfilter-devel, netfilter
Cc: Wensong Zhang, Julian Anastasov, Patrick McHardy
Hi Patrick,
please consider pulling
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next-2.6.git master
to get the following minor change from myself. This pull request is
based on nf-next-2.6.
Simon Horman (1):
IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocks
net/netfilter/ipvs/ip_vs_ctl.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocks
2011-04-05 3:22 [GIT PULL nf-next-2.6] IPVS Simon Horman
@ 2011-04-05 3:22 ` Simon Horman
2011-04-05 10:18 ` [GIT PULL nf-next-2.6] IPVS Patrick McHardy
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2011-04-05 3:22 UTC (permalink / raw)
To: lvs-devel, netdev, netfilter-devel, netfilter
Cc: Wensong Zhang, Julian Anastasov, Patrick McHardy, Simon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_ctl.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 33733c8..36f4495 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1984,9 +1984,6 @@ static const struct file_operations ip_vs_info_fops = {
.release = seq_release_private,
};
-#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [GIT PULL nf-next-2.6] IPVS
2011-04-05 3:22 [GIT PULL nf-next-2.6] IPVS Simon Horman
2011-04-05 3:22 ` [PATCH] IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocks Simon Horman
@ 2011-04-05 10:18 ` Patrick McHardy
1 sibling, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2011-04-05 10:18 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, netfilter, Wensong Zhang,
Julian Anastasov
On 05.04.2011 05:22, Simon Horman wrote:
> Hi Patrick,
>
> please consider pulling
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next-2.6.git master
> to get the following minor change from myself. This pull request is
> based on nf-next-2.6.
>
> Simon Horman (1):
> IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocks
>
Pulled, thanks Simon.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-05 10:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-05 3:22 [GIT PULL nf-next-2.6] IPVS Simon Horman
2011-04-05 3:22 ` [PATCH] IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocks Simon Horman
2011-04-05 10:18 ` [GIT PULL nf-next-2.6] IPVS Patrick McHardy
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).