From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Jan 2022 18:43:08 +0000 (-0800)
Subject: Merge tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v5.17-rc1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ab9c9675fe892e7fe9fa8c0a6125e2b40d2889d;p=thirdparty%2Fkernel%2Flinux.git

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

Pull media fixes from Mauro Carvalho Chehab:

 - some fixes at si2157 tuning logic

 - a warning fix on atomisp when used with clang

* tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: si2157: add support for DVB-C Annex C
  media: si2157: fix bandwidth stored in dev
  media: si2157: fix 6MHz & 6.1MHz bandwidth setting
  media: atomisp: Do not define input_system_cfg2400_t twice
---

2ab9c9675fe892e7fe9fa8c0a6125e2b40d2889d