From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Date: Wed, 26 Jun 2024 13:29:04 +0000 (+0200)
Subject: Merge tag 'tags/next-media-20240626' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: io_uring-6.11-20240722~50^2~82
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b6ee5ac18403f908ad858704f828c6132808df21;p=linux-block.git

Merge tag 'tags/next-media-20240626' of git://git./linux/kernel/git/pinchartl/linux.git

- fix typo in v4l2-subdev.h
- imx-pxp bug fix
- media i2c Kconfig: add missing FW_UPLOAD select

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---

b6ee5ac18403f908ad858704f828c6132808df21