diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-01 11:15:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-01 11:15:57 -0800 |
| commit | 88bb507a74ea7d75fa49edd421eaa710a7d80598 (patch) | |
| tree | f2dd4309d568170260b6ae955c65538f80f11cea /net | |
| parent | 1048ba83fb1c00cd24172e23e8263972f6b5d9ac (diff) | |
| parent | ef357e02b6c420dc2d668ebf3165838c77358acd (diff) | |
| download | linux-88bb507a74ea7d75fa49edd421eaa710a7d80598.tar.gz linux-88bb507a74ea7d75fa49edd421eaa710a7d80598.tar.bz2 linux-88bb507a74ea7d75fa49edd421eaa710a7d80598.zip | |
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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions