diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-02-08 01:44:23 +0200 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-03-03 19:41:04 +0200 |
commit | 330a2d688d8316aac9a9c84ab5f8324254c99491 (patch) | |
tree | 87f141dcef2a47db0c9b0e1f7c54ec49155758da /include/linux/README | |
parent | 09b0801fdb1716c809b1b442015a237974bf6fc5 (diff) |
include: linux: Update Linux headers to v5.12-rc1
Update Linux headers to v5.12-rc1, to provide the
MEDIA_ENT_F_PROC_VIDEO_ISP entity function.
The DRM FourCC and modifiers that were manually added in commits
9db0ed5e2065, 38f2efb05cef and 90c793c6989f are kept. New Intel DRM
format modifiers are conflicting with IPU3_FORMAT_MOD_PACKED, which is
updated as a result.
The V4L2 controls and formats that were manually added in commit
43d81d43fe91 are kept. This causes a conflict in the V4L2 control base
for V4L2_CID_USER_BCM2835_ISP_BASE that needs to be resolved in the
downstream Raspberry Pi kernel first.
The intel-ipu3.h header is manually exported with the
scripts/headers_install.sh script. The script complained about a missing
"WITH Linux-syscall-note" license extension, which has been worked
around manually. The issue has been reported upstream in [1].
[1] https://lore.kernel.org/linux-media/20210207235610.15687-1-laurent.pinchart@ideasonboard.com/T/#u
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include/linux/README')
-rw-r--r-- | include/linux/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/README b/include/linux/README index 5e8614cb..17df9f7b 100644 --- a/include/linux/README +++ b/include/linux/README @@ -1,4 +1,4 @@ # SPDX-License-Identifier: CC0-1.0 -Files in this directory are imported from v5.2 of the Linux kernel. Do not +Files in this directory are imported from v5.12-rc1 of the Linux kernel. Do not modify them manually. |