Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 8 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index cbf127ae7c67..635b8d340cdb 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1071,17 +1071,12 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
                                          const struct in6_addr *final_dst)
 {
         struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
-        int err;
 
         dst = ip6_sk_dst_check(sk, dst, fl6);
+        if (!dst)
+                dst = ip6_dst_lookup_flow(sk, fl6, final_dst);
 
-        err = ip6_dst_lookup_tail(sock_net(sk), sk, &dst, fl6);
-        if (err)
-                return ERR_PTR(err);
-        if (final_dst)
-                fl6->daddr = *final_dst;
-
-        return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);
+        return dst;
 }
 EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow);