64131a87f2
* '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. |
||
|---|---|---|
| .. | ||
| media | ||
| .gitignore | ||
| 80211.tmpl | ||
| Makefile | ||
| alsa-driver-api.tmpl | ||
| crypto-API.tmpl | ||
| debugobjects.tmpl | ||
| device-drivers.tmpl | ||
| deviceiobook.tmpl | ||
| drm.tmpl | ||
| filesystems.tmpl | ||
| gadget.tmpl | ||
| genericirq.tmpl | ||
| kernel-api.tmpl | ||
| kernel-hacking.tmpl | ||
| kernel-locking.tmpl | ||
| kgdb.tmpl | ||
| libata.tmpl | ||
| librs.tmpl | ||
| lsm.tmpl | ||
| media_api.tmpl | ||
| mtdnand.tmpl | ||
| networking.tmpl | ||
| rapidio.tmpl | ||
| regulator.tmpl | ||
| s390-drivers.tmpl | ||
| scsi.tmpl | ||
| sh.tmpl | ||
| stylesheet.xsl | ||
| tracepoint.tmpl | ||
| uio-howto.tmpl | ||
| usb.tmpl | ||
| w1.tmpl | ||
| writing-an-alsa-driver.tmpl | ||
| writing_musb_glue_layer.tmpl | ||
| writing_usb_driver.tmpl | ||
| z8530book.tmpl | ||