diff options
| author | Linus Torvalds <[email protected]> | 2020-11-25 18:35:44 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-11-25 18:35:44 +0000 |
| commit | fa02fcd94b0c8dff6cc65714510cf25ad194b90d (patch) | |
| tree | 4a5a3f87b736c0edfa99f3eda96fa2fb8c5638bc /net/tipc | |
| parent | Merge tag '5.10-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | media: venus: pm_helpers: Fix kernel module reload (diff) | |
| download | kernel-fa02fcd94b0c8dff6cc65714510cf25ad194b90d.tar.gz kernel-fa02fcd94b0c8dff6cc65714510cf25ad194b90d.zip | |
Merge tag 'media/v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- a rand Kconfig fixup for mtk-vcodec
- a fix at h264 handling at cedrus codec driver
- some warning fixes when config PM is not enabled at marvell-ccic
- two fixes at venus codec driver: one related to codec profile and the
other one related to a bad error path which causes an OOPS on module
re-bind
* tag 'media/v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: venus: pm_helpers: Fix kernel module reload
media: venus: venc: Fix setting of profile and level
media: cedrus: h264: Fix check for presence of scaling matrix
media: media/platform/marvell-ccic: fix warnings when CONFIG_PM is not enabled
media: mtk-vcodec: fix build breakage when one of VPU or SCP is enabled
media: mtk-vcodec: move firmware implementations into their own files
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions