netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH 0/4] netfilter updates for nf-next (try 2)
Date: Fri, 16 Nov 2012 13:00:44 -0500 (EST)	[thread overview]
Message-ID: <20121116.130044.936556420105398924.davem@davemloft.net> (raw)
In-Reply-To: <1353069653-3231-1-git-send-email-pablo@netfilter.org>

From: pablo@netfilter.org
Date: Fri, 16 Nov 2012 13:40:49 +0100

> This is the second try to include the following four patches that contain
> updates for your net-next tree, they are:
> 
> * Little cleanup for IPVS the use of a strange notation to assign the
>   conntrack object, from Alan Cox.
> 
> * Another little cleanup for nf_nat to save a couple of lines by using
>   PTR_RET, from Wu Fengguan
> 
> * getsockopt support to obtain the original IPv6 address after NAT,
>   similar to the one that IPv4 provides, from Florian Westphal.
> 
> * Follow-up patch pointed out by YOSHIFUJI Hideaki to only provide
>   the scope_id in case that link is local, again from Florian Westphal.
> 
> You can pull these changes from:
> 
> git://1984.lsi.us.es/nf-next master

Pulled, thanks.

There was a conflict I had to resolve because the net-next tree
had a series of IS_ENABLED conversions that overlapped with some
of the changes in your tree.

      parent reply	other threads:[~2012-11-16 18:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-16 12:40 [PATCH 0/4] netfilter updates for nf-next (try 2) pablo
2012-11-16 12:40 ` [PATCH 1/4] ipvs: remove silly double assignment pablo
2012-11-16 12:40 ` [PATCH 2/4] netfilter: nf_nat: use PTR_RET pablo
2012-11-16 12:40 ` [PATCH 3/4] netfilter: ipv6: add getsockopt to retrieve origdst pablo
2012-11-16 12:40 ` [PATCH 4/4] netfilter: ipv6: only provide sk_bound_dev_if for link-local addr pablo
2012-11-16 18:00 ` David Miller [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=20121116.130044.936556420105398924.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.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).