Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus

* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
  media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
  hexdump: avoid warning in test function
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  smp: Fix error case handling in smp_call_function_*()
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.
  tools/power turbostat: correct dumped pkg-cstate-limit value
  tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
  tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
  tools/power turbostat: Initial Skylake support
  tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
  tools/power turbostat: modprobe msr, if needed
  tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
  tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
  Bluetooth: hidp: Fix regression with older userspace and flags validation
  config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
  perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
  ...

That solves several merge conflicts:
	Documentation/DocBook/media/v4l/subdev-formats.xml
	Documentation/devicetree/bindings/vendor-prefixes.txt
	drivers/staging/media/mn88473/mn88473.c
	include/linux/kconfig.h
	include/uapi/linux/media-bus-format.h

The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.

1 files changed, 29 insertions, 9 deletions

diff --git a/include/linux/init.h b/include/linux/init.h
index 2df8e8dd10a4..21b6d768edd7 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -253,21 +253,41 @@ struct obs_kernel_param {
  * obs_kernel_param "array" too far apart in .init.setup.
  */
 #define __setup_param(str, unique_id, fn, early)                        \
-        static const char __setup_str_##unique_id[] __initconst \
-                __aligned(1) = str; \
-        static struct obs_kernel_param __setup_##unique_id      \
-                __used __section(.init.setup)                   \
-                __attribute__((aligned((sizeof(long)))))        \
+        static const char __setup_str_##unique_id[] __initconst         \
+                __aligned(1) = str;                                     \
+        static struct obs_kernel_param __setup_##unique_id              \
+                __used __section(.init.setup)                           \
+                __attribute__((aligned((sizeof(long)))))                \
                 = { __setup_str_##unique_id, fn, early }
 
-#define __setup(str, fn)                                        \
+#define __setup(str, fn)                                                \
         __setup_param(str, fn, fn, 0)
 
-/* NOTE: fn is as per module_param, not __setup!  Emits warning if fn
- * returns non-zero. */
-#define early_param(str, fn)                                    \
+/*
+ * NOTE: fn is as per module_param, not __setup!
+ * Emits warning if fn returns non-zero.
+ */
+#define early_param(str, fn)                                            \
         __setup_param(str, fn, fn, 1)
 
+#define early_param_on_off(str_on, str_off, var, config)                \
+                                                                        \
+        int var = IS_ENABLED(config);                                   \
+                                                                        \
+        static int __init parse_##var##_on(char *arg)                   \
+        {                                                               \
+                var = 1;                                                \
+                return 0;                                               \
+        }                                                               \
+        __setup_param(str_on, parse_##var##_on, parse_##var##_on, 1);   \
+                                                                        \
+        static int __init parse_##var##_off(char *arg)                  \
+        {                                                               \
+                var = 0;                                                \
+                return 0;                                               \
+        }                                                               \
+        __setup_param(str_off, parse_##var##_off, parse_##var##_off, 1)
+
 /* Relies on boot_command_line being set */
 void __init parse_early_param(void);
 void __init parse_early_options(char *cmdline);