From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Apr 2021 16:24:36 +0000 (-0700)
Subject: Merge tag 'media/v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3aa139aa9fdc138a84243dc49dc18d9b40e1c6e4;p=linux.git

Merge tag 'media/v5.13-1' of git://git./linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - addition of a maintainer's profile for the media subsystem

 - addition of i.MX8 IP support

 - qcom/camss gained support for hardware version Titan 170

 - new RC keymaps

 - Lots of other improvements, cleanups and bug fixes

* tag 'media/v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (488 commits)
  media: coda: fix macroblocks count control usage
  media: rkisp1: params: fix wrong bits settings
  media: cedrus: Fix H265 status definitions
  media: meson-ge2d: fix rotation parameters
  media: v4l2-ctrls: fix reference to freed memory
  media: venus : hfi: add venus image info into smem
  media: venus: Fix internal buffer size calculations for v6.
  media: venus: helpers: keep max bandwidth when mbps exceeds the supported range
  media: venus: fix hw overload error log condition
  media: venus: core: correct firmware name for sm8250
  media: venus: core,pm: fix potential infinite loop
  media: venus: core: Fix kerneldoc warnings
  media: gscpa/stv06xx: fix memory leak
  media: cx25821: remove unused including <linux/version.h>
  media: staging: media/meson: remove redundant dev_err call
  media: adv7842: support 1 block EDIDs, fix clearing EDID
  media: adv7842: configure all pads
  media: allegro: change kernel-doc comment blocks to normal comments
  media: camss: ispif: Remove redundant dev_err call in msm_ispif_subdev_init()
  media: i2c: rdamc21: Fix warning on u8 cast
  ...
---

3aa139aa9fdc138a84243dc49dc18d9b40e1c6e4
diff --cc MAINTAINERS
index 04e7de8c95be7,cb727179826b1..ccc31233f9ee5
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13038,13 -12910,14 +13038,21 @@@ L:	linux-nfc@lists.01.org (moderated fo
  S:	Supported
  F:	drivers/nfc/nxp-nci
  
+ NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
+ M:	Mirela Rabulea <mirela.rabulea@nxp.com>
+ R:	NXP Linux Team <linux-imx@nxp.com>
+ L:	linux-media@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/media/imx8-jpeg.yaml
+ F:	drivers/media/platform/imx-jpeg
+ 
 +NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
 +M:	Jonas Malaco <jonas@protocubo.io>
 +L:	linux-hwmon@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/hwmon/nzxt-kraken2.rst
 +F:	drivers/hwmon/nzxt-kraken2.c
 +
  OBJAGG
  M:	Jiri Pirko <jiri@nvidia.com>
  L:	netdev@vger.kernel.org