Steve Longerbeam 421860b9d4 media: v4l2-ctrls: Fix CID base conflict between MAX217X and IMX ... When the imx-media driver was initially merged, there was a conflict with 8d67ae25 ("media: v4l2-ctrls: Reserve controls for MAX217X") which was not fixed up correctly, resulting in V4L2_CID_USER_MAX217X_BASE and V4L2_CID_USER_IMX_BASE taking on the same value. Fix by assigning imx CID base the next available range at 0x10b0. Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>		2018-07-04 08:04:31 -04:00
..
asm-generic	Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-04 21:02:18 -07:00
drm	drm/tegra: Changes for v4.18-rc1	2018-05-22 10:45:43 +10:00
linux	media: v4l2-ctrls: Fix CID base conflict between MAX217X and IMX	2018-07-04 08:04:31 -04:00
misc	ocxl: Add an IOCTL so userspace knows what OCXL features are available	2018-06-03 20:40:32 +10:00
mtd	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
rdma	Verbs flow counters support	2018-06-04 08:48:11 -06:00
scsi	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
sound	ASoC: Updates for v4.18	2018-06-05 16:51:55 +02:00
video	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
xen	xen/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE	2018-05-14 15:25:37 +02:00