|
On Mon, Jul 23, 2012 at 04:59:49PM +0900, Simon Horman wrote:
> On Mon, Jul 23, 2012 at 10:33:24AM +0300, Julian Anastasov wrote:
> >
> > Hello,
> >
> > On Mon, 23 Jul 2012, Simon Horman wrote:
> >
> > > On Fri, Jul 20, 2012 at 11:59:51AM +0300, Julian Anastasov wrote:
> > > > This patchset implements PMTU Discovery for TUN
> > > > packets and option to disable it.
> > > >
> > > > Julian Anastasov (2):
> > > > ipvs: implement passive PMTUD for IPIP packets
> > > > ipvs: add pmtu_disc option to disable IP DF for TUN packets
> > > >
> > > > include/net/ip_vs.h | 11 +++++
> > > > net/netfilter/ipvs/ip_vs_core.c | 76
> > > > ++++++++++++++++++++++++++++++++++-
> > > > net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++
> > > > net/netfilter/ipvs/ip_vs_xmit.c | 83
> > > > ++++++++++++++++++++++++++------------
> > > > 4 files changed, 149 insertions(+), 29 deletions(-)
> > >
> > > Thanks, I have applied these to ipvs-next.
> > >
> > > There were some offsets when applying the patches
> > > and a conflict in the last hunk of ip_vs_xmit.c (in the first patch).
> > > Could you check to make sure everything went in ok?
> >
> > I created it for net-next on the same day because
> > I saw this problem. Both patches apply even on net-next from
> > today. May be ipvs-next is outdated, net-next changes rapidly
> > last days. If you want to push these patches in this merge
> > window you have to update ipvs-next. If it is not possible
> > I'll resend after 2 weeks.
>
> ipvs-next is based on Pablo's nf-next tree.
> So the timing of updating is up to him.
I just refreshed my tree. Let me know if this is what you needed.
Please, feel free to ping me whenever you need this.
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
