Merge branch 'linus' into perf/core, to fix conflicts

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel_uncore*.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 9 insertions, 0 deletions

diff --git a/include/uapi/linux/random.h b/include/uapi/linux/random.h
index fff3528a078f..3f93d1695e7f 100644
--- a/include/uapi/linux/random.h
+++ b/include/uapi/linux/random.h
@@ -40,4 +40,13 @@ struct rand_pool_info {
         __u32   buf[0];
 };
 
+/*
+ * Flags for getrandom(2)
+ *
+ * GRND_NONBLOCK        Don't block and return EAGAIN instead
+ * GRND_RANDOM          Use the /dev/random pool instead of /dev/urandom
+ */
+#define GRND_NONBLOCK   0x0001
+#define GRND_RANDOM     0x0002
+
 #endif /* _UAPI_LINUX_RANDOM_H */