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, 1 insertions, 2 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index b5474b1fcd83..78003dfb8539 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -192,8 +192,7 @@ struct ipv6_stub {
         int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,
                                struct dst_entry **dst, struct flowi6 *fl6);
         void (*udpv6_encap_enable)(void);
-        void (*ndisc_send_na)(struct net_device *dev, struct neighbour *neigh,
-                              const struct in6_addr *daddr,
+        void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr,
                               const struct in6_addr *solicited_addr,
                               bool router, bool solicited, bool override, bool inc_opt);
         struct neigh_table *nd_tbl;