Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index d64253914a6a..a0d443ca16fc 100644
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -9,6 +9,7 @@ struct kmem_cachep;
 struct net_device;
 struct sk_buff;
 struct sock;
+struct net;
 
 struct dst_ops {
         unsigned short          family;
@@ -28,7 +29,7 @@ struct dst_ops {
                                                struct sk_buff *skb, u32 mtu);
         void                    (*redirect)(struct dst_entry *dst, struct sock *sk,
                                             struct sk_buff *skb);
-        int                     (*local_out)(struct sk_buff *skb);
+        int                     (*local_out)(struct net *net, struct sock *sk, struct sk_buff *skb);
         struct neighbour *      (*neigh_lookup)(const struct dst_entry *dst,
                                                 struct sk_buff *skb,
                                                 const void *daddr);