diff options
author | Dave Airlie <airlied@redhat.com> | 2021-11-12 00:22:28 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2021-11-12 00:23:16 +0100 |
commit | 447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c (patch) | |
tree | 7f60893fe3757c5ac2077809e0f8764bd3944748 /Documentation | |
parent | Merge tag 'amd-drm-fixes-5.16-2021-11-10' of https://gitlab.freedesktop.org/a... (diff) | |
parent | Linux 5.15 (diff) | |
download | linux-447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c.tar.xz linux-447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c.zip |
BackMerge tag 'v5.15' into drm-next
I got a drm-fixes which had some 5.15 stuff in it, so to avoid
the mess just backmerge here.
Linux 5.15
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/userspace-api/ioctl/ioctl-number.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index 2e8134059c87..6655d929a351 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -104,6 +104,7 @@ Code Seq# Include File Comments '8' all SNP8023 advanced NIC card <mailto:mcr@solidum.com> ';' 64-7F linux/vfio.h +'=' 00-3f uapi/linux/ptp_clock.h <mailto:richardcochran@gmail.com> '@' 00-0F linux/radeonfb.h conflict! '@' 00-0F drivers/video/aty/aty128fb.c conflict! 'A' 00-1F linux/apm_bios.h conflict! |