Merge tag 'v4.1-rc3' into patchwork

Linux 4.1-rc3

* tag 'v4.1-rc3': (381 commits)
  Linux 4.1-rc3
  drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
  m32r: make flush_cpumask non-volatile.
  mnt: Fix fs_fully_visible to verify the root directory is visible
  path_openat(): fix double fput()
  namei: d_is_negative() should be checked before ->d_seq validation
  ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for exynos5250-snow
  ARM: dts: Fix typo in trip point temperature for exynos5420/5440
  ARM: dts: add 'rtc_src' clock to rtc node for exynos4412-odroid boards
  ARM: dts: Make DP a consumer of DISP1 power domain on Exynos5420
  MAINTAINERS: add Conexant Digicolor machines entry
  MAINTAINERS: socfpga: update the git repo for SoCFPGA
  drm/tegra: Don't use vblank_disable_immediate on incapable driver.
  mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE
  mmc: dw_mmc: init desc in dw_mci_idmac_init
  ARM: multi_v7_defconfig: Select more FSL SoCs
  MAINTAINERS: replace an AT91 maintainer
  drivers: CCI: fix used_mask init in validate_group()
  drm/radeon: stop trying to suspend UVD sessions
  drm/radeon: more strictly validate the UVD codec
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/platform/marvell-ccic/mcam-core.c
index 2707de8f6245af349207fc31c65b72e4864a57c4,110fd70c73269dbbf5cdbdfb6461fe26eb511b1e..ce5b0eaf0c2098e9482ce4dea22e2d1eaa6b0244
--- 1/drivers/media/platform/marvell-ccic/mcam-core.c
--- 2/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@@ -771,12 -788,16 +771,12 @@@ static void mcam_ctlr_image(struct mcam
                break;
        case V4L2_PIX_FMT_YUYV:
                mcam_reg_write_mask(cam, REG_CTRL0,
-                       C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_UYVY, C0_DF_MASK);
+                       C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_NOSWAP, C0_DF_MASK);
                break;
-       case V4L2_PIX_FMT_UYVY:
+       case V4L2_PIX_FMT_YVYU:
                mcam_reg_write_mask(cam, REG_CTRL0,
-                       C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_YUYV, C0_DF_MASK);
+                       C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_SWAP24, C0_DF_MASK);
                break;
 -      case V4L2_PIX_FMT_JPEG:
 -              mcam_reg_write_mask(cam, REG_CTRL0,
 -                      C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_YUYV, C0_DF_MASK);
 -              break;
        case V4L2_PIX_FMT_RGB444:
                mcam_reg_write_mask(cam, REG_CTRL0,
                        C0_DF_RGB | C0_RGBF_444 | C0_RGB4_XRGB, C0_DF_MASK);

diff --cc drivers/media/platform/marvell-ccic/mcam-core.h
Simple merge

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