From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Feb 2021 19:15:57 +0000 (-0800)
Subject: Merge tag 'media/v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: Ubuntu-5.13.0-19.19~4043
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=88bb507a74ea7d75fa49edd421eaa710a7d80598;p=mirror_ubuntu-jammy-kernel.git

Merge tag 'media/v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "The rockship rkisp1 driver will be promoted from staging in 5.11.

  While not too late, do a few uAPI changes which are needed to better
  support its functionalities"

* tag 'media/v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: rockchip: rkisp1: extend uapi array sizes
  media: rockchip: rkisp1: carry ip version information
  media: rockchip: rkisp1: reduce number of histogram grid elements in uapi
  media: rkisp1: stats: mask the hist_bins values
  media: rkisp1: stats: remove a wrong cast to u8
  media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
---

88bb507a74ea7d75fa49edd421eaa710a7d80598