Commit f79e7722 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:

 - Added a new V4L2 clock helper

 - New camera sensor drivers

 - iris: Enable H.264/H.265 encoder support and fixes in iris driver
   common code

 - camss: add support for new SoC flavors

 - venus: add new SoC support

 - tc358743: support more infoframe types

 - Various fixes, driver improvements and cleanups

* tag 'media/v6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (439 commits)
  media: venus: pm_helpers: add fallback for the opp-table
  media: qcom: camss: vfe: Fix BPL alignment for QCM2290
  media: tuner: xc5000: Fix use-after-free in xc5000_release
  media: i2c: tc358743: Fix use-after-free bugs caused by orphan timer in probe
  media: b2c2: Fix use-after-free causing by irq_check_work in flexcop_pci_remove
  media: vsp1: Export missing vsp1_isp_free_buffer symbol
  media: renesas: vsp1: Convert to SYSTEM_SLEEP/RUNTIME_PM_OPS()
  media: renesas: ceu: Convert to RUNTIME_PM_OPS()
  media: renesas: fdp1: Convert to RUNTIME_PM_OPS()
  media: renesas: rcar-vin: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  media: renesas: rcar_drif: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  media: uvcvideo: Mark invalid entities with id UVC_INVALID_ENTITY_ID
  media: uvcvideo: Support UVC_CROSXU_CONTROL_IQ_PROFILE
  media: uvcvideo: Run uvc_ctrl_init_ctrl for all controls
  media: uvcvideo: Shorten the transfer size non compliance message
  media: uvcvideo: Do not re-reference dev->udev
  media: uvcvideo: Use intf instead of udev for printks
  media: uvcvideo: Move video_device under video_queue
  media: uvcvideo: Drop stream->mutex
  media: uvcvideo: Move MSXU_CONTROL_METADATA definition to header
  ...
parents 58809f61 afb100a5

.mailmap

+4 −2
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>

Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <dikshita@codeaurora.org>

Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <quic_dikshita@quicinc.com>

Dmitry Baryshkov <lumag@kernel.org> <dbaryshkov@gmail.com>

Dmitry Baryshkov <lumag@kernel.org> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <lumag@kernel.org> <dmitry_baryshkov@mentor.com>
@@ -819,7 +820,8 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com> 
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>

Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>

Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>

Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/ABI/testing/debugfs-cec-error-inj

+1 −1
Original line number Diff line number Diff line 
What:		/sys/kernel/debug/cec/*/error-inj

Date:		March 2018

Contact:	Hans Verkuil <hverkuil-cisco@xs4all.nl>

Contact:	Hans Verkuil <hverkuil@kernel.org>

Description:



The CEC Framework allows for CEC error injection commands through

Documentation/admin-guide/bug-hunting.rst

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ For example, if you find a bug at the gspca's sonixj.c file, you can get 
its maintainers with::



	$ ./scripts/get_maintainer.pl --bug -f drivers/media/usb/gspca/sonixj.c

	Hans Verkuil <hverkuil@xs4all.nl> (odd fixer:GSPCA USB WEBCAM DRIVER,commit_signer:1/1=100%)

	Hans Verkuil <hverkuil@kernel.org> (odd fixer:GSPCA USB WEBCAM DRIVER,commit_signer:1/1=100%)

	Mauro Carvalho Chehab <mchehab@kernel.org> (maintainer:MEDIA INPUT INFRASTRUCTURE (V4L/DVB),commit_signer:1/1=100%)

	Tejun Heo <tj@kernel.org> (commit_signer:1/1=100%)

	Bhaktipriya Shridhar <bhaktipriya96@gmail.com> (commit_signer:1/1=100%,authored:1/1=100%,added_lines:4/4=100%,removed_lines:9/9=100%)

Documentation/admin-guide/media/i2c-cardlist.rst

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ ov5647 OmniVision OV5647 sensor 
ov5670        OmniVision OV5670 sensor

ov5675        OmniVision OV5675 sensor

ov5695        OmniVision OV5695 sensor

ov6650        OmniVision OV6650 sensor

ov7251        OmniVision OV7251 sensor

ov7640        OmniVision OV7640 sensor

ov7670        OmniVision OV7670 sensor

Documentation/admin-guide/media/ivtv.rst

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
The ivtv driver

===============



Author: Hans Verkuil <hverkuil@xs4all.nl>

Author: Hans Verkuil <hverkuil@kernel.org>



This is a v4l2 device driver for the Conexant cx23415/6 MPEG encoder/decoder.

The cx23415 can do both encoding and decoding, the cx23416 can only do MPEG