* [GIT PULL nf-next] IPVS Updates for v3.16
@ 2014-04-21 0:16 Simon Horman
2014-04-21 0:16 ` [PATCH nf-next] netfilter: Fix format string mismatch in ip_vs_proto_name() Simon Horman
2014-04-23 12:17 ` [GIT PULL nf-next] IPVS Updates for v3.16 Pablo Neira Ayuso
0 siblings, 2 replies; 4+ messages in thread
From: Simon Horman @ 2014-04-21 0:16 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Simon Horman
Hi Pablo,
please consider the following updates for IPVS for v3.16.
It consists of a format string fix from Masanari Iida.
The following changes since commit 6125c94e6972fca79214809a43eb60e27feff3ee:
netfilter: nft_ct: split nft_ct_init() into two functions for get/set (2014-03-30 13:31:44 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs-for-v3.16
for you to fetch changes up to 9c55bfa9373b4b44c32f0e844923a0e6c607056d:
netfilter: Fix format string mismatch in ip_vs_proto_name() (2014-04-03 10:35:35 +0900)
----------------------------------------------------------------
IPVS Updates for v3.16
* Format string fix from Masanari Iida
----------------------------------------------------------------
Masanari Iida (1):
netfilter: Fix format string mismatch in ip_vs_proto_name()
net/netfilter/ipvs/ip_vs_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH nf-next] netfilter: Fix format string mismatch in ip_vs_proto_name()
2014-04-21 0:16 [GIT PULL nf-next] IPVS Updates for v3.16 Simon Horman
@ 2014-04-21 0:16 ` Simon Horman
2014-04-23 12:17 ` [GIT PULL nf-next] IPVS Updates for v3.16 Pablo Neira Ayuso
1 sibling, 0 replies; 4+ messages in thread
From: Simon Horman @ 2014-04-21 0:16 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Masanari Iida, Simon Horman
From: Masanari Iida <standby24x7@gmail.com>
Fix string mismatch in ip_vs_proto_name()
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 4f26ee4..d9da8c4 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -97,7 +97,7 @@ const char *ip_vs_proto_name(unsigned int proto)
return "ICMPv6";
#endif
default:
- sprintf(buf, "IP_%d", proto);
+ sprintf(buf, "IP_%u", proto);
return buf;
}
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [GIT PULL nf-next] IPVS Updates for v3.16
2014-04-21 0:16 [GIT PULL nf-next] IPVS Updates for v3.16 Simon Horman
2014-04-21 0:16 ` [PATCH nf-next] netfilter: Fix format string mismatch in ip_vs_proto_name() Simon Horman
@ 2014-04-23 12:17 ` Pablo Neira Ayuso
2014-04-24 0:50 ` Simon Horman
1 sibling, 1 reply; 4+ messages in thread
From: Pablo Neira Ayuso @ 2014-04-23 12:17 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov
Hi Simon,
On Mon, Apr 21, 2014 at 09:16:46AM +0900, Simon Horman wrote:
> Hi Pablo,
>
> please consider the following updates for IPVS for v3.16.
>
> It consists of a format string fix from Masanari Iida.
>
>
> The following changes since commit 6125c94e6972fca79214809a43eb60e27feff3ee:
>
> netfilter: nft_ct: split nft_ct_init() into two functions for get/set (2014-03-30 13:31:44 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs-for-v3.16
I'm going to manually apply this small patch.
There was a small cleanup for nfnetlink that has reached David's tree
in a bigger batch that I already applied in my tree, so I needed to
REbase to avoid problems. You'll also have to rebase as well. Sorry.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL nf-next] IPVS Updates for v3.16
2014-04-23 12:17 ` [GIT PULL nf-next] IPVS Updates for v3.16 Pablo Neira Ayuso
@ 2014-04-24 0:50 ` Simon Horman
0 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2014-04-24 0:50 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov
On Wed, Apr 23, 2014 at 02:17:15PM +0200, Pablo Neira Ayuso wrote:
> Hi Simon,
>
> On Mon, Apr 21, 2014 at 09:16:46AM +0900, Simon Horman wrote:
> > Hi Pablo,
> >
> > please consider the following updates for IPVS for v3.16.
> >
> > It consists of a format string fix from Masanari Iida.
> >
> >
> > The following changes since commit 6125c94e6972fca79214809a43eb60e27feff3ee:
> >
> > netfilter: nft_ct: split nft_ct_init() into two functions for get/set (2014-03-30 13:31:44 +0200)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs-for-v3.16
>
> I'm going to manually apply this small patch.
>
> There was a small cleanup for nfnetlink that has reached David's tree
> in a bigger batch that I already applied in my tree, so I needed to
> REbase to avoid problems. You'll also have to rebase as well. Sorry.
Thanks, that is perfectly fine by me.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-04-24 0:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-21 0:16 [GIT PULL nf-next] IPVS Updates for v3.16 Simon Horman
2014-04-21 0:16 ` [PATCH nf-next] netfilter: Fix format string mismatch in ip_vs_proto_name() Simon Horman
2014-04-23 12:17 ` [GIT PULL nf-next] IPVS Updates for v3.16 Pablo Neira Ayuso
2014-04-24 0:50 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.