]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into...
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 21 Apr 2015 09:33:03 +0000 (06:33 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 21 Apr 2015 12:44:55 +0000 (09:44 -0300)
commit64131a87f2aae2ed9e05d8227c5b009ca6c50d98
treefdea23fd59216120bf54a48c60ca24489a733f14
parent676ee36be04985062522804c2de04f0764212be6
parent2c33ce009ca2389dbf0535d0672214d09738e35e
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.
18 files changed:
Documentation/DocBook/media/v4l/subdev-formats.xml
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
drivers/input/touchscreen/Kconfig
drivers/media/dvb-core/dvb_net.c
drivers/media/platform/am437x/am437x-vpfe.c
drivers/media/platform/soc_camera/soc_camera.c
drivers/staging/media/bcm2048/radio-bcm2048.c
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
drivers/staging/media/davinci_vpfe/dm365_resizer.c
drivers/staging/media/mn88472/mn88472.c
drivers/staging/media/mn88473/mn88473.c
drivers/staging/media/omap4iss/iss_video.c
drivers/usb/gadget/function/uvc_v4l2.c
drivers/usb/gadget/function/uvc_video.c
include/linux/kconfig.h
include/uapi/linux/Kbuild
include/uapi/linux/media-bus-format.h