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, 4 insertions, 17 deletions

diff --git a/include/linux/net.h b/include/linux/net.h
index 049d4b03c4c4..70ac5e28e6b7 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -24,7 +24,8 @@
 #include <linux/fcntl.h>        /* For O_CLOEXEC and O_NONBLOCK */
 #include <linux/kmemcheck.h>
 #include <linux/rcupdate.h>
-#include <linux/jump_label.h>
+#include <linux/once.h>
+
 #include <uapi/linux/net.h>
 
 struct poll_table_struct;
@@ -250,22 +251,8 @@ do {								\
         } while (0)
 #endif
 
-bool __net_get_random_once(void *buf, int nbytes, bool *done,
-                           struct static_key *done_key);
-
-#define net_get_random_once(buf, nbytes)                                \
-        ({                                                              \
-                bool ___ret = false;                                    \
-                static bool ___done = false;                            \
-                static struct static_key ___once_key =                  \
-                        STATIC_KEY_INIT_TRUE;                           \
-                if (static_key_true(&___once_key))                      \
-                        ___ret = __net_get_random_once(buf,             \
-                                                       nbytes,          \
-                                                       &___done,        \
-                                                       &___once_key);   \
-                ___ret;                                                 \
-        })
+#define net_get_random_once(buf, nbytes)                        \
+        get_random_once((buf), (nbytes))
 
 int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,
                    size_t num, size_t len);