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

* '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.

diff --cc Documentation/DocBook/media/v4l/subdev-formats.xml
index bc8d3fb,553a380..2588ad7
--- 1/Documentation/DocBook/media/v4l/subdev-formats.xml
--- 2/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@@ -440,36 -482,96 +482,126 @@@ see <xref linkend="colorspaces" />.</en
              <entry>b<subscript>1</subscript></entry>
              <entry>b<subscript>0</subscript></entry>
            </row>
 +          <row id="MEDIA-BUS-FMT-RBG888-1X24">
 +            <entry>MEDIA_BUS_FMT_RBG888_1X24</entry>
 +            <entry>0x100e</entry>
 +            <entry></entry>
 +            &dash-ent-8;
 +            <entry>r<subscript>7</subscript></entry>
 +            <entry>r<subscript>6</subscript></entry>
 +            <entry>r<subscript>5</subscript></entry>
 +            <entry>r<subscript>4</subscript></entry>
 +            <entry>r<subscript>3</subscript></entry>
 +            <entry>r<subscript>2</subscript></entry>
 +            <entry>r<subscript>1</subscript></entry>
 +            <entry>r<subscript>0</subscript></entry>
 +            <entry>b<subscript>7</subscript></entry>
 +            <entry>b<subscript>6</subscript></entry>
 +            <entry>b<subscript>5</subscript></entry>
 +            <entry>b<subscript>4</subscript></entry>
 +            <entry>b<subscript>3</subscript></entry>
 +            <entry>b<subscript>2</subscript></entry>
 +            <entry>b<subscript>1</subscript></entry>
 +            <entry>b<subscript>0</subscript></entry>
 +            <entry>g<subscript>7</subscript></entry>
 +            <entry>g<subscript>6</subscript></entry>
 +            <entry>g<subscript>5</subscript></entry>
 +            <entry>g<subscript>4</subscript></entry>
 +            <entry>g<subscript>3</subscript></entry>
 +            <entry>g<subscript>2</subscript></entry>
 +            <entry>g<subscript>1</subscript></entry>
 +            <entry>g<subscript>0</subscript></entry>
 +          </row>
+           <row id="MEDIA-BUS-FMT-RGB666-1X24_CPADHI">
+             <entry>MEDIA_BUS_FMT_RGB666_1X24_CPADHI</entry>
+             <entry>0x1015</entry>
+             <entry></entry>
+             &dash-ent-8;
+             <entry>0</entry>
+             <entry>0</entry>
+             <entry>r<subscript>5</subscript></entry>
+             <entry>r<subscript>4</subscript></entry>
+             <entry>r<subscript>3</subscript></entry>
+             <entry>r<subscript>2</subscript></entry>
+             <entry>r<subscript>1</subscript></entry>
+             <entry>r<subscript>0</subscript></entry>
+             <entry>0</entry>
+             <entry>0</entry>
+             <entry>g<subscript>5</subscript></entry>
+             <entry>g<subscript>4</subscript></entry>
+             <entry>g<subscript>3</subscript></entry>
+             <entry>g<subscript>2</subscript></entry>
+             <entry>g<subscript>1</subscript></entry>
+             <entry>g<subscript>0</subscript></entry>
+             <entry>0</entry>
+             <entry>0</entry>
+             <entry>b<subscript>5</subscript></entry>
+             <entry>b<subscript>4</subscript></entry>
+             <entry>b<subscript>3</subscript></entry>
+             <entry>b<subscript>2</subscript></entry>
+             <entry>b<subscript>1</subscript></entry>
+             <entry>b<subscript>0</subscript></entry>
+           </row>
+           <row id="MEDIA-BUS-FMT-BGR888-1X24">
+             <entry>MEDIA_BUS_FMT_BGR888_1X24</entry>
+             <entry>0x1013</entry>
+             <entry></entry>
+             &dash-ent-8;
+             <entry>b<subscript>7</subscript></entry>
+             <entry>b<subscript>6</subscript></entry>
+             <entry>b<subscript>5</subscript></entry>
+             <entry>b<subscript>4</subscript></entry>
+             <entry>b<subscript>3</subscript></entry>
+             <entry>b<subscript>2</subscript></entry>
+             <entry>b<subscript>1</subscript></entry>
+             <entry>b<subscript>0</subscript></entry>
+             <entry>g<subscript>7</subscript></entry>
+             <entry>g<subscript>6</subscript></entry>
+             <entry>g<subscript>5</subscript></entry>
+             <entry>g<subscript>4</subscript></entry>
+             <entry>g<subscript>3</subscript></entry>
+             <entry>g<subscript>2</subscript></entry>
+             <entry>g<subscript>1</subscript></entry>
+             <entry>g<subscript>0</subscript></entry>
+             <entry>r<subscript>7</subscript></entry>
+             <entry>r<subscript>6</subscript></entry>
+             <entry>r<subscript>5</subscript></entry>
+             <entry>r<subscript>4</subscript></entry>
+             <entry>r<subscript>3</subscript></entry>
+             <entry>r<subscript>2</subscript></entry>
+             <entry>r<subscript>1</subscript></entry>
+             <entry>r<subscript>0</subscript></entry>
+           </row>
+           <row id="MEDIA-BUS-FMT-GBR888-1X24">
+             <entry>MEDIA_BUS_FMT_GBR888_1X24</entry>
+             <entry>0x1014</entry>
+             <entry></entry>
+             &dash-ent-8;
+             <entry>g<subscript>7</subscript></entry>
+             <entry>g<subscript>6</subscript></entry>
+             <entry>g<subscript>5</subscript></entry>
+             <entry>g<subscript>4</subscript></entry>
+             <entry>g<subscript>3</subscript></entry>
+             <entry>g<subscript>2</subscript></entry>
+             <entry>g<subscript>1</subscript></entry>
+             <entry>g<subscript>0</subscript></entry>
+             <entry>b<subscript>7</subscript></entry>
+             <entry>b<subscript>6</subscript></entry>
+             <entry>b<subscript>5</subscript></entry>
+             <entry>b<subscript>4</subscript></entry>
+             <entry>b<subscript>3</subscript></entry>
+             <entry>b<subscript>2</subscript></entry>
+             <entry>b<subscript>1</subscript></entry>
+             <entry>b<subscript>0</subscript></entry>
+             <entry>r<subscript>7</subscript></entry>
+             <entry>r<subscript>6</subscript></entry>
+             <entry>r<subscript>5</subscript></entry>
+             <entry>r<subscript>4</subscript></entry>
+             <entry>r<subscript>3</subscript></entry>
+             <entry>r<subscript>2</subscript></entry>
+             <entry>r<subscript>1</subscript></entry>
+             <entry>r<subscript>0</subscript></entry>
+           </row>
            <row id="MEDIA-BUS-FMT-RGB888-1X24">
              <entry>MEDIA_BUS_FMT_RGB888_1X24</entry>
              <entry>0x100a</entry>
@@@ -3004,47 -3427,25 +3391,84 @@@
              <entry>y<subscript>2</subscript></entry>
              <entry>y<subscript>1</subscript></entry>
              <entry>y<subscript>0</subscript></entry>
 +            <entry>u<subscript>9</subscript></entry>
 +            <entry>u<subscript>8</subscript></entry>
 +            <entry>u<subscript>7</subscript></entry>
 +            <entry>u<subscript>6</subscript></entry>
 +            <entry>u<subscript>5</subscript></entry>
 +            <entry>u<subscript>4</subscript></entry>
 +            <entry>u<subscript>3</subscript></entry>
 +            <entry>u<subscript>2</subscript></entry>
 +            <entry>u<subscript>1</subscript></entry>
 +            <entry>u<subscript>0</subscript></entry>
            </row>
 -          <row>
 -            <entry></entry>
 +          <row id="MEDIA-BUS-FMT-VUY8-1X24">
 +            <entry>MEDIA_BUS_FMT_VUY8_1X24</entry>
 +            <entry>0x201a</entry>
              <entry></entry>
 -            &dash-ent-20;
 -            <entry>u<subscript>11</subscript></entry>
 -            <entry>u<subscript>10</subscript></entry>
 -            <entry>u<subscript>9</subscript></entry>
 -            <entry>u<subscript>8</subscript></entry>
 +            &dash-ent-8;
 +            <entry>v<subscript>7</subscript></entry>
 +            <entry>v<subscript>6</subscript></entry>
 +            <entry>v<subscript>5</subscript></entry>
 +            <entry>v<subscript>4</subscript></entry>
 +            <entry>v<subscript>3</subscript></entry>
 +            <entry>v<subscript>2</subscript></entry>
 +            <entry>v<subscript>1</subscript></entry>
 +            <entry>v<subscript>0</subscript></entry>
 +            <entry>u<subscript>7</subscript></entry>
 +            <entry>u<subscript>6</subscript></entry>
 +            <entry>u<subscript>5</subscript></entry>
 +            <entry>u<subscript>4</subscript></entry>
 +            <entry>u<subscript>3</subscript></entry>
 +            <entry>u<subscript>2</subscript></entry>
 +            <entry>u<subscript>1</subscript></entry>
 +            <entry>u<subscript>0</subscript></entry>
 +            <entry>y<subscript>7</subscript></entry>
 +            <entry>y<subscript>6</subscript></entry>
 +            <entry>y<subscript>5</subscript></entry>
 +            <entry>y<subscript>4</subscript></entry>
 +            <entry>y<subscript>3</subscript></entry>
 +            <entry>y<subscript>2</subscript></entry>
 +            <entry>y<subscript>1</subscript></entry>
 +            <entry>y<subscript>0</subscript></entry>
 +          </row>
++          <row id="MEDIA-BUS-FMT-YUV8-1X24">
++            <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
++            <entry>0x2025</entry>
+             <entry></entry>
++            <entry>-</entry>
++            <entry>-</entry>
++            <entry>-</entry>
++            <entry>-</entry>
++            <entry>-</entry>
++            <entry>-</entry>
++            <entry>-</entry>
++            <entry>-</entry>
++            <entry>y<subscript>7</subscript></entry>
++            <entry>y<subscript>6</subscript></entry>
++            <entry>y<subscript>5</subscript></entry>
++            <entry>y<subscript>4</subscript></entry>
++            <entry>y<subscript>3</subscript></entry>
++            <entry>y<subscript>2</subscript></entry>
++            <entry>y<subscript>1</subscript></entry>
++            <entry>y<subscript>0</subscript></entry>
+             <entry>u<subscript>7</subscript></entry>
+             <entry>u<subscript>6</subscript></entry>
+             <entry>u<subscript>5</subscript></entry>
+             <entry>u<subscript>4</subscript></entry>
+             <entry>u<subscript>3</subscript></entry>
+             <entry>u<subscript>2</subscript></entry>
+             <entry>u<subscript>1</subscript></entry>
+             <entry>u<subscript>0</subscript></entry>
++            <entry>v<subscript>7</subscript></entry>
++            <entry>v<subscript>6</subscript></entry>
++            <entry>v<subscript>5</subscript></entry>
++            <entry>v<subscript>4</subscript></entry>
++            <entry>v<subscript>3</subscript></entry>
++            <entry>v<subscript>2</subscript></entry>
++            <entry>v<subscript>1</subscript></entry>
++            <entry>v<subscript>0</subscript></entry>
+           </row>
            <row id="MEDIA-BUS-FMT-UYVY12-1X24">
              <entry>MEDIA_BUS_FMT_UYVY12_1X24</entry>
              <entry>0x2020</entry>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 4326f52,4f8edb2..aecec35
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -20,7 -21,7 +21,8 @@@ ampire        Ampire Co., Ltd
  ams   AMS AG
  amstaos       AMS-Taos Inc.
  apm   Applied Micro Circuits Corporation (APM)
 +aptina        Aptina Imaging
+ arasan        Arasan Chip Systems
  arm   ARM Ltd.
  armadeus      ARMadeus Systems SARL
  asahi-kasei   Asahi Kasei Corp.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/media/dvb-core/dvb_net.c
Simple merge

diff --cc drivers/media/platform/am437x/am437x-vpfe.c
index 4899924,0d07fca..a30cc2f
--- 1/drivers/media/platform/am437x/am437x-vpfe.c
--- 2/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@@ -2501,15 -2500,10 +2501,14 @@@ vpfe_get_pdata(struct platform_device *
                pdata->asd[i] = devm_kzalloc(&pdev->dev,
                                             sizeof(struct v4l2_async_subdev),
                                             GFP_KERNEL);
 +              if (!pdata->asd[i]) {
 +                      of_node_put(rem);
 +                      pdata = NULL;
 +                      goto done;
 +              }
 +
                pdata->asd[i]->match_type = V4L2_ASYNC_MATCH_OF;
                pdata->asd[i]->match.of.node = rem;
-               of_node_put(endpoint);
                of_node_put(rem);
        }
  

diff --cc drivers/media/platform/soc_camera/soc_camera.c
Simple merge

diff --cc drivers/staging/media/bcm2048/radio-bcm2048.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_resizer.c
Simple merge

diff --cc drivers/staging/media/mn88472/mn88472.c
Simple merge

diff --cc drivers/staging/media/mn88473/mn88473.c
Simple merge

diff --cc drivers/staging/media/omap4iss/iss_video.c
Simple merge

diff --cc drivers/usb/gadget/function/uvc_v4l2.c
Simple merge

diff --cc drivers/usb/gadget/function/uvc_video.c
Simple merge

diff --cc include/linux/kconfig.h
index 16cfb34,63ca8da..b33c779
--- 1/include/linux/kconfig.h
--- 2/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@@ -43,13 -35,11 +35,20 @@@
   */
  #define IS_MODULE(option) config_enabled(option##_MODULE)
  
 +/*
 + * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled
 + * code can call a function defined in code compiled based on CONFIG_FOO.
 + * This is similar to IS_ENABLED(), but returns false when invoked from
 + * built-in code when CONFIG_FOO is set to 'm'.
 + */
 +#define IS_REACHABLE(option) (config_enabled(option) || \
 +               (config_enabled(option##_MODULE) && config_enabled(MODULE)))
 +
+ /*
+  * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
+  * 0 otherwise.
+  */
+ #define IS_ENABLED(option) \
+       (IS_BUILTIN(option) || IS_MODULE(option))
+ 
  #endif /* __LINUX_KCONFIG_H */

diff --cc include/uapi/linux/Kbuild
Simple merge

diff --cc include/uapi/linux/media-bus-format.h
index d391893,73c78f1..190d491
--- 1/include/uapi/linux/media-bus-format.h
--- 2/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@@ -43,14 -45,18 +45,20 @@@
  #define MEDIA_BUS_FMT_RGB565_2X8_BE           0x1007
  #define MEDIA_BUS_FMT_RGB565_2X8_LE           0x1008
  #define MEDIA_BUS_FMT_RGB666_1X18             0x1009
 +#define MEDIA_BUS_FMT_RBG888_1X24             0x100e
+ #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI      0x1015
+ #define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG               0x1010
+ #define MEDIA_BUS_FMT_BGR888_1X24             0x1013
+ #define MEDIA_BUS_FMT_GBR888_1X24             0x1014
  #define MEDIA_BUS_FMT_RGB888_1X24             0x100a
  #define MEDIA_BUS_FMT_RGB888_2X12_BE          0x100b
  #define MEDIA_BUS_FMT_RGB888_2X12_LE          0x100c
+ #define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG               0x1011
+ #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA      0x1012
  #define MEDIA_BUS_FMT_ARGB8888_1X32           0x100d
 +#define MEDIA_BUS_FMT_RGB888_1X32_PADHI               0x100f
  
- /* YUV (including grey) - next is     0x2025 */
+ /* YUV (including grey) - next is     0x2026 */
  #define MEDIA_BUS_FMT_Y8_1X8                  0x2001
  #define MEDIA_BUS_FMT_UV8_1X8                 0x2015
  #define MEDIA_BUS_FMT_UYVY8_1_5X8             0x2002
@@@ -80,7 -82,13 +88,8 @@@
  #define MEDIA_BUS_FMT_VYUY10_1X20             0x201b
  #define MEDIA_BUS_FMT_YUYV10_1X20             0x200d
  #define MEDIA_BUS_FMT_YVYU10_1X20             0x200e
 -#define MEDIA_BUS_FMT_YUV10_1X30              0x2016
 -#define MEDIA_BUS_FMT_AYUV8_1X32              0x2017
 -#define MEDIA_BUS_FMT_UYVY12_2X12             0x201c
 -#define MEDIA_BUS_FMT_VYUY12_2X12             0x201d
 -#define MEDIA_BUS_FMT_YUYV12_2X12             0x201e
 -#define MEDIA_BUS_FMT_YVYU12_2X12             0x201f
 +#define MEDIA_BUS_FMT_VUY8_1X24                       0x2024
+ #define MEDIA_BUS_FMT_YUV8_1X24                       0x2025
  #define MEDIA_BUS_FMT_UYVY12_1X24             0x2020
  #define MEDIA_BUS_FMT_VYUY12_1X24             0x2021
  #define MEDIA_BUS_FMT_YUYV12_1X24             0x2022