Merge branch 'master' of git://1984.lsi.us.es/nf-next

Conflicts:
	net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

Minor conflict due to some IS_ENABLED conversions done
in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 5 insertions, 5 deletions

diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
index 022e77e1e766..c8beafd401aa 100644
--- a/net/netfilter/ipvs/ip_vs_nfct.c
+++ b/net/netfilter/ipvs/ip_vs_nfct.c
@@ -82,7 +82,7 @@ void
 ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin)
 {
         enum ip_conntrack_info ctinfo;
-        struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
         struct nf_conntrack_tuple new_tuple;
 
         if (ct == NULL || nf_ct_is_confirmed(ct) || nf_ct_is_untracked(ct) ||
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 12008b47e5ca..ee6b7a9f1ec2 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -594,7 +594,7 @@ ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
         if (cp->flags & IP_VS_CONN_F_SYNC && local) {
                 enum ip_conntrack_info ctinfo;
-                struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+                struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
 
                 if (ct && !nf_ct_is_untracked(ct)) {
                         IP_VS_DBG_RL_PKT(10, AF_INET, pp, skb, 0,
@@ -710,7 +710,7 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
         if (cp->flags & IP_VS_CONN_F_SYNC && local) {
                 enum ip_conntrack_info ctinfo;
-                struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+                struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
 
                 if (ct && !nf_ct_is_untracked(ct)) {
                         IP_VS_DBG_RL_PKT(10, AF_INET6, pp, skb, 0,
@@ -1235,7 +1235,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
         if (cp->flags & IP_VS_CONN_F_SYNC && local) {
                 enum ip_conntrack_info ctinfo;
-                struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+                struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
 
                 if (ct && !nf_ct_is_untracked(ct)) {
                         IP_VS_DBG(10, "%s(): "
@@ -1356,7 +1356,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
         if (cp->flags & IP_VS_CONN_F_SYNC && local) {
                 enum ip_conntrack_info ctinfo;
-                struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+                struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
 
                 if (ct && !nf_ct_is_untracked(ct)) {
                         IP_VS_DBG(10, "%s(): "