renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-17 10:04:14 +08:00
Code
64131a87f2
linux-next/drivers/media/platform
History
Mauro Carvalho Chehab 64131a87f2 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.
2015-04-21 09:44:55 -03:00
..
am437x Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 2015-04-21 09:44:55 -03:00
blackfin [media] media: blackfin: bfin_capture: embed video_device struct in bcap_device 2015-04-02 18:11:50 -03:00
coda [media] coda: Add tracing support 2015-04-10 10:12:31 -03:00
davinci [media] media: davinci: vpfe_capture: embed video_device 2015-04-02 23:54:00 -03:00
exynos4-is [media] v4l2-subdev: replace v4l2_subdev_fh by v4l2_subdev_pad_config 2015-03-23 11:41:36 -07:00
exynos-gsc [media] media: exynos-gsc: use vb2_ops_wait_prepare/finish helper 2014-12-22 14:34:35 -02:00
marvell-ccic [media] v4l2-subdev: add support for the new enum_frame_interval 'which' field 2015-03-23 12:01:15 -07:00
omap [media] media: omap/omap_vout: fix type of input members to omap_vout_setup_vrfb_bufs() 2015-03-03 11:22:58 -03:00
omap3isp [media] media: omap3isp: remove unused clkdev 2015-04-10 10:25:30 -03:00
s3c-camif [media] v4l2-subdev: replace v4l2_subdev_fh by v4l2_subdev_pad_config 2015-03-23 11:41:36 -07:00
s5p-g2d [media] s5p-g2d: remove unnecessary version.h inclusion 2015-02-02 09:58:23 -02:00
s5p-jpeg Merge branch 'patchwork' into v4l_for_linus 2015-04-21 06:12:35 -03:00
s5p-mfc Merge branch 'patchwork' into v4l_for_linus 2015-04-21 06:12:35 -03:00
s5p-tv Merge branch 'patchwork' into v4l_for_linus 2015-04-21 06:12:35 -03:00
soc_camera Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 2015-04-21 09:44:55 -03:00
ti-vpe [media] media: ti-vpe: Use mem-to-mem ioctl helpers 2015-02-02 13:34:18 -02:00
vivid [media] vivid: use V4L2_DV_FL_IS_CE_VIDEO instead of V4L2_DV_BT_STD_CEA861 2015-04-08 06:38:56 -03:00
vsp1 [media] v4l2-subdev: add support for the new enum_frame_size 'which' field 2015-03-23 11:48:55 -07:00
xilinx [media] v4l: xilinx: Add Test Pattern Generator driver 2015-04-03 01:04:18 -03:00
arv.c [media] media: remove the setting of the flag V4L2_FL_USE_FH_PRIO 2014-07-04 16:14:59 -03:00
fsl-viu.c Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
Kconfig [media] v4l: xilinx: Add Xilinx Video IP core 2015-04-03 00:59:49 -03:00
m2m-deinterlace.c [media] m2m-deinterlace: embed video_device 2015-04-02 23:35:21 -03:00
Makefile [media] v4l: xilinx: Add Xilinx Video IP core 2015-04-03 00:59:49 -03:00
mx2_emmaprp.c Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
sh_veu.c [media] sh_veu: v4l2_dev wasn't set 2015-04-01 06:56:55 -03:00
sh_vou.c [media] media: sh_vou: embed video_device 2015-04-02 23:55:50 -03:00
timblogiw.c media: platform: drop owner assignment from platform_drivers 2014-10-20 16:20:44 +02:00
via-camera.c [media] v4l2-subdev: add support for the new enum_frame_interval 'which' field 2015-03-23 12:01:15 -07:00
via-camera.h
vim2m.c [media] vim2m: embed video_device 2015-04-02 23:24:40 -03:00