407 files changed, 11 insertions, 11 deletions

diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 5aa2161fc3df..4c87a41e8ca8 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -35,7 +35,7 @@ quiet_cmd_sphinx = SPHINX  $@
       cmd_sphinx = BUILDDIR=$(BUILDDIR) $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
 
 htmldocs:
-        $(MAKE) BUILDDIR=$(BUILDDIR) -f $(srctree)/Documentation/linux_tv/Makefile $@
+        $(MAKE) BUILDDIR=$(BUILDDIR) -f $(srctree)/Documentation/media/Makefile $@
         $(call cmd,sphinx,html)
 
 pdfdocs:
diff --git a/Documentation/index.rst b/Documentation/index.rst
index 8bc7bf4e6041..ad07716c73f4 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -14,7 +14,7 @@ Contents:
    :maxdepth: 2
 
    kernel-documentation
-   linux_tv/index
+   media/media_uapi
 
 Indices and tables
 ==================
diff --git a/Documentation/linux_tv/Makefile b/Documentation/media/Makefile
index 688e37d7b232..0efd91e9998b 100644
--- a/Documentation/linux_tv/Makefile
+++ b/Documentation/media/Makefile
@@ -2,7 +2,7 @@
 
 PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl
 UAPI = $(srctree)/include/uapi/linux
-SRC_DIR=$(srctree)/Documentation/linux_tv
+SRC_DIR=$(srctree)/Documentation/media
 
 FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \
           videodev2.h.rst
diff --git a/Documentation/linux_tv/audio.h.rst.exceptions b/Documentation/media/audio.h.rst.exceptions
index 8330edcd906d..8330edcd906d 100644
--- a/Documentation/linux_tv/audio.h.rst.exceptions
+++ b/Documentation/media/audio.h.rst.exceptions
diff --git a/Documentation/linux_tv/ca.h.rst.exceptions b/Documentation/media/ca.h.rst.exceptions
index 09c13be67527..09c13be67527 100644
--- a/Documentation/linux_tv/ca.h.rst.exceptions
+++ b/Documentation/media/ca.h.rst.exceptions
diff --git a/Documentation/linux_tv/dmx.h.rst.exceptions b/Documentation/media/dmx.h.rst.exceptions
index 8200653839d2..8200653839d2 100644
--- a/Documentation/linux_tv/dmx.h.rst.exceptions
+++ b/Documentation/media/dmx.h.rst.exceptions
diff --git a/Documentation/linux_tv/frontend.h.rst.exceptions b/Documentation/media/frontend.h.rst.exceptions
index 60f2cbb92656..60f2cbb92656 100644
--- a/Documentation/linux_tv/frontend.h.rst.exceptions
+++ b/Documentation/media/frontend.h.rst.exceptions
diff --git a/Documentation/linux_tv/media_api_files/typical_media_device.pdf b/Documentation/media/media_api_files/typical_media_device.pdf
index eb3045813815..eb3045813815 100644
--- a/Documentation/linux_tv/media_api_files/typical_media_device.pdf
+++ b/Documentation/media/media_api_files/typical_media_device.pdf
diff --git a/Documentation/linux_tv/media_api_files/typical_media_device.svg b/Documentation/media/media_api_files/typical_media_device.svg
index f0c82f72c4b6..f0c82f72c4b6 100644
--- a/Documentation/linux_tv/media_api_files/typical_media_device.svg
+++ b/Documentation/media/media_api_files/typical_media_device.svg
diff --git a/Documentation/linux_tv/index.rst b/Documentation/media/media_uapi.rst
index 67b3ef6ec3d7..8211cc963b56 100644
--- a/Documentation/linux_tv/index.rst
+++ b/Documentation/media/media_uapi.rst
@@ -68,12 +68,12 @@ etc, please mail to:
 .. toctree::
     :maxdepth: 1
 
-    media/v4l/v4l2
-    media/dvb/dvbapi
-    media/rc/remote_controllers
-    media/mediactl/media-controller
-    media/gen-errors
-    media/fdl-appendix
+    uapi/v4l/v4l2
+    uapi/dvb/dvbapi
+    uapi/rc/remote_controllers
+    uapi/mediactl/media-controller
+    uapi/gen-errors
+    uapi/fdl-appendix
 
 .. only:: html
 
diff --git a/Documentation/linux_tv/net.h.rst.exceptions b/Documentation/media/net.h.rst.exceptions
index 30a267483aa9..30a267483aa9 100644
--- a/Documentation/linux_tv/net.h.rst.exceptions
+++ b/Documentation/media/net.h.rst.exceptions
diff --git a/Documentation/linux_tv/media/dvb/audio-bilingual-channel-select.rst b/Documentation/media/uapi/dvb/audio-bilingual-channel-select.rst
index dbe20ff38e83..dbe20ff38e83 100644
--- a/Documentation/linux_tv/media/dvb/audio-bilingual-channel-select.rst
+++ b/Documentation/media/uapi/dvb/audio-bilingual-channel-select.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-channel-select.rst b/Documentation/media/uapi/dvb/audio-channel-select.rst
index 69df4c0f2fb2..69df4c0f2fb2 100644
--- a/Documentation/linux_tv/media/dvb/audio-channel-select.rst
+++ b/Documentation/media/uapi/dvb/audio-channel-select.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-clear-buffer.rst b/Documentation/media/uapi/dvb/audio-clear-buffer.rst
index a3dec29bdc69..a3dec29bdc69 100644
--- a/Documentation/linux_tv/media/dvb/audio-clear-buffer.rst
+++ b/Documentation/media/uapi/dvb/audio-clear-buffer.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-continue.rst b/Documentation/media/uapi/dvb/audio-continue.rst
index 053627dd61e7..053627dd61e7 100644
--- a/Documentation/linux_tv/media/dvb/audio-continue.rst
+++ b/Documentation/media/uapi/dvb/audio-continue.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-fclose.rst b/Documentation/media/uapi/dvb/audio-fclose.rst
index e5d4225cd9d7..e5d4225cd9d7 100644
--- a/Documentation/linux_tv/media/dvb/audio-fclose.rst
+++ b/Documentation/media/uapi/dvb/audio-fclose.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-fopen.rst b/Documentation/media/uapi/dvb/audio-fopen.rst
index ec3b23aa79b3..ec3b23aa79b3 100644
--- a/Documentation/linux_tv/media/dvb/audio-fopen.rst
+++ b/Documentation/media/uapi/dvb/audio-fopen.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-fwrite.rst b/Documentation/media/uapi/dvb/audio-fwrite.rst
index ca95b9be0c2a..ca95b9be0c2a 100644
--- a/Documentation/linux_tv/media/dvb/audio-fwrite.rst
+++ b/Documentation/media/uapi/dvb/audio-fwrite.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-get-capabilities.rst b/Documentation/media/uapi/dvb/audio-get-capabilities.rst
index e274a8d53785..e274a8d53785 100644
--- a/Documentation/linux_tv/media/dvb/audio-get-capabilities.rst
+++ b/Documentation/media/uapi/dvb/audio-get-capabilities.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-get-pts.rst b/Documentation/media/uapi/dvb/audio-get-pts.rst
index 5f875508b833..5f875508b833 100644
--- a/Documentation/linux_tv/media/dvb/audio-get-pts.rst
+++ b/Documentation/media/uapi/dvb/audio-get-pts.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-get-status.rst b/Documentation/media/uapi/dvb/audio-get-status.rst
index cbd822773d85..cbd822773d85 100644
--- a/Documentation/linux_tv/media/dvb/audio-get-status.rst
+++ b/Documentation/media/uapi/dvb/audio-get-status.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-pause.rst b/Documentation/media/uapi/dvb/audio-pause.rst
index 9ca263e90c6c..9ca263e90c6c 100644
--- a/Documentation/linux_tv/media/dvb/audio-pause.rst
+++ b/Documentation/media/uapi/dvb/audio-pause.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-play.rst b/Documentation/media/uapi/dvb/audio-play.rst
index db4d7203acc5..db4d7203acc5 100644
--- a/Documentation/linux_tv/media/dvb/audio-play.rst
+++ b/Documentation/media/uapi/dvb/audio-play.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-select-source.rst b/Documentation/media/uapi/dvb/audio-select-source.rst
index b806d806a46f..b806d806a46f 100644
--- a/Documentation/linux_tv/media/dvb/audio-select-source.rst
+++ b/Documentation/media/uapi/dvb/audio-select-source.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-attributes.rst b/Documentation/media/uapi/dvb/audio-set-attributes.rst
index 18667cea2cdf..18667cea2cdf 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-attributes.rst
+++ b/Documentation/media/uapi/dvb/audio-set-attributes.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-av-sync.rst b/Documentation/media/uapi/dvb/audio-set-av-sync.rst
index 6f7e26fa4cd1..6f7e26fa4cd1 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-av-sync.rst
+++ b/Documentation/media/uapi/dvb/audio-set-av-sync.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-bypass-mode.rst b/Documentation/media/uapi/dvb/audio-set-bypass-mode.rst
index 30bcaca14c3f..30bcaca14c3f 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-bypass-mode.rst
+++ b/Documentation/media/uapi/dvb/audio-set-bypass-mode.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-ext-id.rst b/Documentation/media/uapi/dvb/audio-set-ext-id.rst
index 049414db8ef6..049414db8ef6 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-ext-id.rst
+++ b/Documentation/media/uapi/dvb/audio-set-ext-id.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-id.rst b/Documentation/media/uapi/dvb/audio-set-id.rst
index a664dc1955cb..a664dc1955cb 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-id.rst
+++ b/Documentation/media/uapi/dvb/audio-set-id.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-karaoke.rst b/Documentation/media/uapi/dvb/audio-set-karaoke.rst
index b55f8380b9cd..b55f8380b9cd 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-karaoke.rst
+++ b/Documentation/media/uapi/dvb/audio-set-karaoke.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-mixer.rst b/Documentation/media/uapi/dvb/audio-set-mixer.rst
index 67821729c2b6..67821729c2b6 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-mixer.rst
+++ b/Documentation/media/uapi/dvb/audio-set-mixer.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-mute.rst b/Documentation/media/uapi/dvb/audio-set-mute.rst
index ebaba95ee278..ebaba95ee278 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-mute.rst
+++ b/Documentation/media/uapi/dvb/audio-set-mute.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-set-streamtype.rst b/Documentation/media/uapi/dvb/audio-set-streamtype.rst
index dfb9a6c00d88..dfb9a6c00d88 100644
--- a/Documentation/linux_tv/media/dvb/audio-set-streamtype.rst
+++ b/Documentation/media/uapi/dvb/audio-set-streamtype.rst
diff --git a/Documentation/linux_tv/media/dvb/audio-stop.rst b/Documentation/media/uapi/dvb/audio-stop.rst
index 449127e3f2aa..449127e3f2aa 100644
--- a/Documentation/linux_tv/media/dvb/audio-stop.rst
+++ b/Documentation/media/uapi/dvb/audio-stop.rst
diff --git a/Documentation/linux_tv/media/dvb/audio.rst b/Documentation/media/uapi/dvb/audio.rst
index 155622185ea4..155622185ea4 100644
--- a/Documentation/linux_tv/media/dvb/audio.rst
+++ b/Documentation/media/uapi/dvb/audio.rst
diff --git a/Documentation/linux_tv/media/dvb/audio_data_types.rst b/Documentation/media/uapi/dvb/audio_data_types.rst
index 4a53127eb13a..4a53127eb13a 100644
--- a/Documentation/linux_tv/media/dvb/audio_data_types.rst
+++ b/Documentation/media/uapi/dvb/audio_data_types.rst
diff --git a/Documentation/linux_tv/media/dvb/audio_function_calls.rst b/Documentation/media/uapi/dvb/audio_function_calls.rst
index 0bb56f0cfed4..0bb56f0cfed4 100644
--- a/Documentation/linux_tv/media/dvb/audio_function_calls.rst
+++ b/Documentation/media/uapi/dvb/audio_function_calls.rst
diff --git a/Documentation/linux_tv/media/dvb/audio_h.rst b/Documentation/media/uapi/dvb/audio_h.rst
index e00c3010fdf9..e00c3010fdf9 100644
--- a/Documentation/linux_tv/media/dvb/audio_h.rst
+++ b/Documentation/media/uapi/dvb/audio_h.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-fclose.rst b/Documentation/media/uapi/dvb/ca-fclose.rst
index 16d7a1e76193..16d7a1e76193 100644
--- a/Documentation/linux_tv/media/dvb/ca-fclose.rst
+++ b/Documentation/media/uapi/dvb/ca-fclose.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-fopen.rst b/Documentation/media/uapi/dvb/ca-fopen.rst
index f284461cce20..f284461cce20 100644
--- a/Documentation/linux_tv/media/dvb/ca-fopen.rst
+++ b/Documentation/media/uapi/dvb/ca-fopen.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-get-cap.rst b/Documentation/media/uapi/dvb/ca-get-cap.rst
index 891fbf2d9a84..891fbf2d9a84 100644
--- a/Documentation/linux_tv/media/dvb/ca-get-cap.rst
+++ b/Documentation/media/uapi/dvb/ca-get-cap.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-get-descr-info.rst b/Documentation/media/uapi/dvb/ca-get-descr-info.rst
index cf8e8242db66..cf8e8242db66 100644
--- a/Documentation/linux_tv/media/dvb/ca-get-descr-info.rst
+++ b/Documentation/media/uapi/dvb/ca-get-descr-info.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-get-msg.rst b/Documentation/media/uapi/dvb/ca-get-msg.rst
index 56004d5ea3ab..56004d5ea3ab 100644
--- a/Documentation/linux_tv/media/dvb/ca-get-msg.rst
+++ b/Documentation/media/uapi/dvb/ca-get-msg.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-get-slot-info.rst b/Documentation/media/uapi/dvb/ca-get-slot-info.rst
index 9fea28ccad0f..9fea28ccad0f 100644
--- a/Documentation/linux_tv/media/dvb/ca-get-slot-info.rst
+++ b/Documentation/media/uapi/dvb/ca-get-slot-info.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-reset.rst b/Documentation/media/uapi/dvb/ca-reset.rst
index d5a50088fc2d..d5a50088fc2d 100644
--- a/Documentation/linux_tv/media/dvb/ca-reset.rst
+++ b/Documentation/media/uapi/dvb/ca-reset.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-send-msg.rst b/Documentation/media/uapi/dvb/ca-send-msg.rst
index 18974e61e788..18974e61e788 100644
--- a/Documentation/linux_tv/media/dvb/ca-send-msg.rst
+++ b/Documentation/media/uapi/dvb/ca-send-msg.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-set-descr.rst b/Documentation/media/uapi/dvb/ca-set-descr.rst
index 293e6da5059f..293e6da5059f 100644
--- a/Documentation/linux_tv/media/dvb/ca-set-descr.rst
+++ b/Documentation/media/uapi/dvb/ca-set-descr.rst
diff --git a/Documentation/linux_tv/media/dvb/ca-set-pid.rst b/Documentation/media/uapi/dvb/ca-set-pid.rst
index 5afa2fae3206..5afa2fae3206 100644
--- a/Documentation/linux_tv/media/dvb/ca-set-pid.rst
+++ b/Documentation/media/uapi/dvb/ca-set-pid.rst
diff --git a/Documentation/linux_tv/media/dvb/ca.rst b/Documentation/media/uapi/dvb/ca.rst
index 14b14abda1ae..14b14abda1ae 100644
--- a/Documentation/linux_tv/media/dvb/ca.rst
+++ b/Documentation/media/uapi/dvb/ca.rst
diff --git a/Documentation/linux_tv/media/dvb/ca_data_types.rst b/Documentation/media/uapi/dvb/ca_data_types.rst
index 025f910ae945..025f910ae945 100644
--- a/Documentation/linux_tv/media/dvb/ca_data_types.rst
+++ b/Documentation/media/uapi/dvb/ca_data_types.rst
diff --git a/Documentation/linux_tv/media/dvb/ca_function_calls.rst b/Documentation/media/uapi/dvb/ca_function_calls.rst
index c085a0ebbc05..c085a0ebbc05 100644
--- a/Documentation/linux_tv/media/dvb/ca_function_calls.rst
+++ b/Documentation/media/uapi/dvb/ca_function_calls.rst
diff --git a/Documentation/linux_tv/media/dvb/ca_h.rst b/Documentation/media/uapi/dvb/ca_h.rst
index f513592ef529..f513592ef529 100644
--- a/Documentation/linux_tv/media/dvb/ca_h.rst
+++ b/Documentation/media/uapi/dvb/ca_h.rst
diff --git a/Documentation/linux_tv/media/dvb/demux.rst b/Documentation/media/uapi/dvb/demux.rst
index b12b5a2dac94..b12b5a2dac94 100644
--- a/Documentation/linux_tv/media/dvb/demux.rst
+++ b/Documentation/media/uapi/dvb/demux.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-add-pid.rst b/Documentation/media/uapi/dvb/dmx-add-pid.rst
index 6343035653ac..6343035653ac 100644
--- a/Documentation/linux_tv/media/dvb/dmx-add-pid.rst
+++ b/Documentation/media/uapi/dvb/dmx-add-pid.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-fclose.rst b/Documentation/media/uapi/dvb/dmx-fclose.rst
index f54c2a1220c1..f54c2a1220c1 100644
--- a/Documentation/linux_tv/media/dvb/dmx-fclose.rst
+++ b/Documentation/media/uapi/dvb/dmx-fclose.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-fopen.rst b/Documentation/media/uapi/dvb/dmx-fopen.rst
index 76dbb42713ad..76dbb42713ad 100644
--- a/Documentation/linux_tv/media/dvb/dmx-fopen.rst
+++ b/Documentation/media/uapi/dvb/dmx-fopen.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-fread.rst b/Documentation/media/uapi/dvb/dmx-fread.rst
index d25b19e4f696..d25b19e4f696 100644
--- a/Documentation/linux_tv/media/dvb/dmx-fread.rst
+++ b/Documentation/media/uapi/dvb/dmx-fread.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-fwrite.rst b/Documentation/media/uapi/dvb/dmx-fwrite.rst
index 9efd81a1b5c8..9efd81a1b5c8 100644
--- a/Documentation/linux_tv/media/dvb/dmx-fwrite.rst
+++ b/Documentation/media/uapi/dvb/dmx-fwrite.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-get-caps.rst b/Documentation/media/uapi/dvb/dmx-get-caps.rst
index d0549eb7fbd3..d0549eb7fbd3 100644
--- a/Documentation/linux_tv/media/dvb/dmx-get-caps.rst
+++ b/Documentation/media/uapi/dvb/dmx-get-caps.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-get-event.rst b/Documentation/media/uapi/dvb/dmx-get-event.rst
index 6a7550c63bb5..6a7550c63bb5 100644
--- a/Documentation/linux_tv/media/dvb/dmx-get-event.rst
+++ b/Documentation/media/uapi/dvb/dmx-get-event.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-get-pes-pids.rst b/Documentation/media/uapi/dvb/dmx-get-pes-pids.rst
index ba5d30c913c8..ba5d30c913c8 100644
--- a/Documentation/linux_tv/media/dvb/dmx-get-pes-pids.rst
+++ b/Documentation/media/uapi/dvb/dmx-get-pes-pids.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-get-stc.rst b/Documentation/media/uapi/dvb/dmx-get-stc.rst
index bd477bb67082..bd477bb67082 100644
--- a/Documentation/linux_tv/media/dvb/dmx-get-stc.rst
+++ b/Documentation/media/uapi/dvb/dmx-get-stc.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-remove-pid.rst b/Documentation/media/uapi/dvb/dmx-remove-pid.rst
index c8f038b40074..c8f038b40074 100644
--- a/Documentation/linux_tv/media/dvb/dmx-remove-pid.rst
+++ b/Documentation/media/uapi/dvb/dmx-remove-pid.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-set-buffer-size.rst b/Documentation/media/uapi/dvb/dmx-set-buffer-size.rst
index 8ae48cf39cda..8ae48cf39cda 100644
--- a/Documentation/linux_tv/media/dvb/dmx-set-buffer-size.rst
+++ b/Documentation/media/uapi/dvb/dmx-set-buffer-size.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-set-filter.rst b/Documentation/media/uapi/dvb/dmx-set-filter.rst
index 8c929fa9b98c..8c929fa9b98c 100644
--- a/Documentation/linux_tv/media/dvb/dmx-set-filter.rst
+++ b/Documentation/media/uapi/dvb/dmx-set-filter.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-set-pes-filter.rst b/Documentation/media/uapi/dvb/dmx-set-pes-filter.rst
index addc321011ce..addc321011ce 100644
--- a/Documentation/linux_tv/media/dvb/dmx-set-pes-filter.rst
+++ b/Documentation/media/uapi/dvb/dmx-set-pes-filter.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-set-source.rst b/Documentation/media/uapi/dvb/dmx-set-source.rst
index 99a8d5c82756..99a8d5c82756 100644
--- a/Documentation/linux_tv/media/dvb/dmx-set-source.rst
+++ b/Documentation/media/uapi/dvb/dmx-set-source.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-start.rst b/Documentation/media/uapi/dvb/dmx-start.rst
index 9835d1e78400..9835d1e78400 100644
--- a/Documentation/linux_tv/media/dvb/dmx-start.rst
+++ b/Documentation/media/uapi/dvb/dmx-start.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx-stop.rst b/Documentation/media/uapi/dvb/dmx-stop.rst
index 7e4bf09fc83e..7e4bf09fc83e 100644
--- a/Documentation/linux_tv/media/dvb/dmx-stop.rst
+++ b/Documentation/media/uapi/dvb/dmx-stop.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx_fcalls.rst b/Documentation/media/uapi/dvb/dmx_fcalls.rst
index 77a1554d9834..77a1554d9834 100644
--- a/Documentation/linux_tv/media/dvb/dmx_fcalls.rst
+++ b/Documentation/media/uapi/dvb/dmx_fcalls.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx_h.rst b/Documentation/media/uapi/dvb/dmx_h.rst
index 4fd1704a0833..4fd1704a0833 100644
--- a/Documentation/linux_tv/media/dvb/dmx_h.rst
+++ b/Documentation/media/uapi/dvb/dmx_h.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx_types.rst b/Documentation/media/uapi/dvb/dmx_types.rst
index 7a8900af2680..7a8900af2680 100644
--- a/Documentation/linux_tv/media/dvb/dmx_types.rst
+++ b/Documentation/media/uapi/dvb/dmx_types.rst
diff --git a/Documentation/linux_tv/media/dvb/dtv-fe-stats.rst b/Documentation/media/uapi/dvb/dtv-fe-stats.rst
index 7c105e2ab27e..7c105e2ab27e 100644
--- a/Documentation/linux_tv/media/dvb/dtv-fe-stats.rst
+++ b/Documentation/media/uapi/dvb/dtv-fe-stats.rst
diff --git a/Documentation/linux_tv/media/dvb/dtv-properties.rst b/Documentation/media/uapi/dvb/dtv-properties.rst
index c13be5de4302..c13be5de4302 100644
--- a/Documentation/linux_tv/media/dvb/dtv-properties.rst
+++ b/Documentation/media/uapi/dvb/dtv-properties.rst
diff --git a/Documentation/linux_tv/media/dvb/dtv-property.rst b/Documentation/media/uapi/dvb/dtv-property.rst
index 5073a49def2a..5073a49def2a 100644
--- a/Documentation/linux_tv/media/dvb/dtv-property.rst
+++ b/Documentation/media/uapi/dvb/dtv-property.rst
diff --git a/Documentation/linux_tv/media/dvb/dtv-stats.rst b/Documentation/media/uapi/dvb/dtv-stats.rst
index 2cfdca00f164..2cfdca00f164 100644
--- a/Documentation/linux_tv/media/dvb/dtv-stats.rst
+++ b/Documentation/media/uapi/dvb/dtv-stats.rst
diff --git a/Documentation/linux_tv/media/dvb/dvb-fe-read-status.rst b/Documentation/media/uapi/dvb/dvb-fe-read-status.rst
index 1c708c5e6bc0..1c708c5e6bc0 100644
--- a/Documentation/linux_tv/media/dvb/dvb-fe-read-status.rst
+++ b/Documentation/media/uapi/dvb/dvb-fe-read-status.rst
diff --git a/Documentation/linux_tv/media/dvb/dvb-frontend-event.rst b/Documentation/media/uapi/dvb/dvb-frontend-event.rst
index 78e72feaa178..78e72feaa178 100644
--- a/Documentation/linux_tv/media/dvb/dvb-frontend-event.rst
+++ b/Documentation/media/uapi/dvb/dvb-frontend-event.rst
diff --git a/Documentation/linux_tv/media/dvb/dvb-frontend-parameters.rst b/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst
index 16cb581d5cff..16cb581d5cff 100644
--- a/Documentation/linux_tv/media/dvb/dvb-frontend-parameters.rst
+++ b/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst
diff --git a/Documentation/linux_tv/media/dvb/dvbapi.rst b/Documentation/media/uapi/dvb/dvbapi.rst
index 60fb3d46b1d6..60fb3d46b1d6 100644
--- a/Documentation/linux_tv/media/dvb/dvbapi.rst
+++ b/Documentation/media/uapi/dvb/dvbapi.rst
diff --git a/Documentation/linux_tv/media/dvb/dvbproperty-006.rst b/Documentation/media/uapi/dvb/dvbproperty-006.rst
index 3343a0f306fe..3343a0f306fe 100644
--- a/Documentation/linux_tv/media/dvb/dvbproperty-006.rst
+++ b/Documentation/media/uapi/dvb/dvbproperty-006.rst
diff --git a/Documentation/linux_tv/media/dvb/dvbproperty.rst b/Documentation/media/uapi/dvb/dvbproperty.rst
index 9b3782c5bb44..9b3782c5bb44 100644
--- a/Documentation/linux_tv/media/dvb/dvbproperty.rst
+++ b/Documentation/media/uapi/dvb/dvbproperty.rst
diff --git a/Documentation/linux_tv/media/dvb/examples.rst b/Documentation/media/uapi/dvb/examples.rst
index 64e029ecd047..64e029ecd047 100644
--- a/Documentation/linux_tv/media/dvb/examples.rst
+++ b/Documentation/media/uapi/dvb/examples.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-bandwidth-t.rst b/Documentation/media/uapi/dvb/fe-bandwidth-t.rst
index 8edaf1a8fbc8..8edaf1a8fbc8 100644
--- a/Documentation/linux_tv/media/dvb/fe-bandwidth-t.rst
+++ b/Documentation/media/uapi/dvb/fe-bandwidth-t.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-diseqc-recv-slave-reply.rst b/Documentation/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst
index 7bd02ac7bff4..7bd02ac7bff4 100644
--- a/Documentation/linux_tv/media/dvb/fe-diseqc-recv-slave-reply.rst
+++ b/Documentation/media/uapi/dvb/fe-diseqc-recv-slave-reply.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-diseqc-reset-overload.rst b/Documentation/media/uapi/dvb/fe-diseqc-reset-overload.rst
index cab157054c13..cab157054c13 100644
--- a/Documentation/linux_tv/media/dvb/fe-diseqc-reset-overload.rst
+++ b/Documentation/media/uapi/dvb/fe-diseqc-reset-overload.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-diseqc-send-burst.rst b/Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst
index 9b476545ef89..9b476545ef89 100644
--- a/Documentation/linux_tv/media/dvb/fe-diseqc-send-burst.rst
+++ b/Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-diseqc-send-master-cmd.rst b/Documentation/media/uapi/dvb/fe-diseqc-send-master-cmd.rst
index 58a5e6ac10bd..58a5e6ac10bd 100644
--- a/Documentation/linux_tv/media/dvb/fe-diseqc-send-master-cmd.rst
+++ b/Documentation/media/uapi/dvb/fe-diseqc-send-master-cmd.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-dishnetwork-send-legacy-cmd.rst b/Documentation/media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst
index 9f71b39de0c2..9f71b39de0c2 100644
--- a/Documentation/linux_tv/media/dvb/fe-dishnetwork-send-legacy-cmd.rst
+++ b/Documentation/media/uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-enable-high-lnb-voltage.rst b/Documentation/media/uapi/dvb/fe-enable-high-lnb-voltage.rst
index de99bf5fbf0e..de99bf5fbf0e 100644
--- a/Documentation/linux_tv/media/dvb/fe-enable-high-lnb-voltage.rst
+++ b/Documentation/media/uapi/dvb/fe-enable-high-lnb-voltage.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-get-event.rst b/Documentation/media/uapi/dvb/fe-get-event.rst
index ffa3d04c6bd4..ffa3d04c6bd4 100644
--- a/Documentation/linux_tv/media/dvb/fe-get-event.rst
+++ b/Documentation/media/uapi/dvb/fe-get-event.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-get-frontend.rst b/Documentation/media/uapi/dvb/fe-get-frontend.rst
index 5d2df808df18..5d2df808df18 100644
--- a/Documentation/linux_tv/media/dvb/fe-get-frontend.rst
+++ b/Documentation/media/uapi/dvb/fe-get-frontend.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-get-info.rst b/Documentation/media/uapi/dvb/fe-get-info.rst
index 9a9ddbcdb1ec..9a9ddbcdb1ec 100644
--- a/Documentation/linux_tv/media/dvb/fe-get-info.rst
+++ b/Documentation/media/uapi/dvb/fe-get-info.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-get-property.rst b/Documentation/media/uapi/dvb/fe-get-property.rst
index 749daafe6b21..749daafe6b21 100644
--- a/Documentation/linux_tv/media/dvb/fe-get-property.rst
+++ b/Documentation/media/uapi/dvb/fe-get-property.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-read-ber.rst b/Documentation/media/uapi/dvb/fe-read-ber.rst
index c2b5b417f5fb..c2b5b417f5fb 100644
--- a/Documentation/linux_tv/media/dvb/fe-read-ber.rst
+++ b/Documentation/media/uapi/dvb/fe-read-ber.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-read-signal-strength.rst b/Documentation/media/uapi/dvb/fe-read-signal-strength.rst
index 0cdee2effc97..0cdee2effc97 100644
--- a/Documentation/linux_tv/media/dvb/fe-read-signal-strength.rst
+++ b/Documentation/media/uapi/dvb/fe-read-signal-strength.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-read-snr.rst b/Documentation/media/uapi/dvb/fe-read-snr.rst
index 5394f9ae90f4..5394f9ae90f4 100644
--- a/Documentation/linux_tv/media/dvb/fe-read-snr.rst
+++ b/Documentation/media/uapi/dvb/fe-read-snr.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-read-status.rst b/Documentation/media/uapi/dvb/fe-read-status.rst
index 339955fbe133..339955fbe133 100644
--- a/Documentation/linux_tv/media/dvb/fe-read-status.rst
+++ b/Documentation/media/uapi/dvb/fe-read-status.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-read-uncorrected-blocks.rst b/Documentation/media/uapi/dvb/fe-read-uncorrected-blocks.rst
index 5c29c058dfdc..5c29c058dfdc 100644
--- a/Documentation/linux_tv/media/dvb/fe-read-uncorrected-blocks.rst
+++ b/Documentation/media/uapi/dvb/fe-read-uncorrected-blocks.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-set-frontend-tune-mode.rst b/Documentation/media/uapi/dvb/fe-set-frontend-tune-mode.rst
index 411abcf4de58..411abcf4de58 100644
--- a/Documentation/linux_tv/media/dvb/fe-set-frontend-tune-mode.rst
+++ b/Documentation/media/uapi/dvb/fe-set-frontend-tune-mode.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-set-frontend.rst b/Documentation/media/uapi/dvb/fe-set-frontend.rst
index 7cb70c38d534..7cb70c38d534 100644
--- a/Documentation/linux_tv/media/dvb/fe-set-frontend.rst
+++ b/Documentation/media/uapi/dvb/fe-set-frontend.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-set-tone.rst b/Documentation/media/uapi/dvb/fe-set-tone.rst
index 763b61d91004..763b61d91004 100644
--- a/Documentation/linux_tv/media/dvb/fe-set-tone.rst
+++ b/Documentation/media/uapi/dvb/fe-set-tone.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-set-voltage.rst b/Documentation/media/uapi/dvb/fe-set-voltage.rst
index 517f79bdbb4b..517f79bdbb4b 100644
--- a/Documentation/linux_tv/media/dvb/fe-set-voltage.rst
+++ b/Documentation/media/uapi/dvb/fe-set-voltage.rst
diff --git a/Documentation/linux_tv/media/dvb/fe-type-t.rst b/Documentation/media/uapi/dvb/fe-type-t.rst
index 8ca762b42e4d..8ca762b42e4d 100644
--- a/Documentation/linux_tv/media/dvb/fe-type-t.rst
+++ b/Documentation/media/uapi/dvb/fe-type-t.rst
diff --git a/Documentation/linux_tv/media/dvb/fe_property_parameters.rst b/Documentation/media/uapi/dvb/fe_property_parameters.rst
index 47eb29350717..47eb29350717 100644
--- a/Documentation/linux_tv/media/dvb/fe_property_parameters.rst
+++ b/Documentation/media/uapi/dvb/fe_property_parameters.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend-property-cable-systems.rst b/Documentation/media/uapi/dvb/frontend-property-cable-systems.rst
index bf2328627af5..bf2328627af5 100644
--- a/Documentation/linux_tv/media/dvb/frontend-property-cable-systems.rst
+++ b/Documentation/media/uapi/dvb/frontend-property-cable-systems.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend-property-satellite-systems.rst b/Documentation/media/uapi/dvb/frontend-property-satellite-systems.rst
index 1f40399c68ff..1f40399c68ff 100644
--- a/Documentation/linux_tv/media/dvb/frontend-property-satellite-systems.rst
+++ b/Documentation/media/uapi/dvb/frontend-property-satellite-systems.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend-property-terrestrial-systems.rst b/Documentation/media/uapi/dvb/frontend-property-terrestrial-systems.rst
index dbc717cad9ee..dbc717cad9ee 100644
--- a/Documentation/linux_tv/media/dvb/frontend-property-terrestrial-systems.rst
+++ b/Documentation/media/uapi/dvb/frontend-property-terrestrial-systems.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend-stat-properties.rst b/Documentation/media/uapi/dvb/frontend-stat-properties.rst
index 0fc4aaa304ff..0fc4aaa304ff 100644
--- a/Documentation/linux_tv/media/dvb/frontend-stat-properties.rst
+++ b/Documentation/media/uapi/dvb/frontend-stat-properties.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend.rst b/Documentation/media/uapi/dvb/frontend.rst
index 8c7e502bff1f..8c7e502bff1f 100644
--- a/Documentation/linux_tv/media/dvb/frontend.rst
+++ b/Documentation/media/uapi/dvb/frontend.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend_f_close.rst b/Documentation/media/uapi/dvb/frontend_f_close.rst
index 5cce9262084c..5cce9262084c 100644
--- a/Documentation/linux_tv/media/dvb/frontend_f_close.rst
+++ b/Documentation/media/uapi/dvb/frontend_f_close.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend_f_open.rst b/Documentation/media/uapi/dvb/frontend_f_open.rst
index e0c55345f524..e0c55345f524 100644
--- a/Documentation/linux_tv/media/dvb/frontend_f_open.rst
+++ b/Documentation/media/uapi/dvb/frontend_f_open.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend_fcalls.rst b/Documentation/media/uapi/dvb/frontend_fcalls.rst
index b03f9cab6d5a..b03f9cab6d5a 100644
--- a/Documentation/linux_tv/media/dvb/frontend_fcalls.rst
+++ b/Documentation/media/uapi/dvb/frontend_fcalls.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend_h.rst b/Documentation/media/uapi/dvb/frontend_h.rst
index 15fca04d1c32..15fca04d1c32 100644
--- a/Documentation/linux_tv/media/dvb/frontend_h.rst
+++ b/Documentation/media/uapi/dvb/frontend_h.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend_legacy_api.rst b/Documentation/media/uapi/dvb/frontend_legacy_api.rst
index 759833d3eaa4..759833d3eaa4 100644
--- a/Documentation/linux_tv/media/dvb/frontend_legacy_api.rst
+++ b/Documentation/media/uapi/dvb/frontend_legacy_api.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend_legacy_dvbv3_api.rst b/Documentation/media/uapi/dvb/frontend_legacy_dvbv3_api.rst
index 7d4a091b7d7f..7d4a091b7d7f 100644
--- a/Documentation/linux_tv/media/dvb/frontend_legacy_dvbv3_api.rst
+++ b/Documentation/media/uapi/dvb/frontend_legacy_dvbv3_api.rst
diff --git a/Documentation/linux_tv/media/dvb/intro.rst b/Documentation/media/uapi/dvb/intro.rst
index b61081d00a9f..b61081d00a9f 100644
--- a/Documentation/linux_tv/media/dvb/intro.rst
+++ b/Documentation/media/uapi/dvb/intro.rst
diff --git a/Documentation/linux_tv/media/dvb/intro_files/dvbstb.pdf b/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf
index 0fa75d90c3eb..0fa75d90c3eb 100644
--- a/Documentation/linux_tv/media/dvb/intro_files/dvbstb.pdf
+++ b/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf
diff --git a/Documentation/linux_tv/media/dvb/intro_files/dvbstb.png b/Documentation/media/uapi/dvb/intro_files/dvbstb.png
index 9b8f372e7afd..9b8f372e7afd 100644
--- a/Documentation/linux_tv/media/dvb/intro_files/dvbstb.png
+++ b/Documentation/media/uapi/dvb/intro_files/dvbstb.png
diff --git a/Documentation/linux_tv/media/dvb/legacy_dvb_apis.rst b/Documentation/media/uapi/dvb/legacy_dvb_apis.rst
index 2957f5a988b0..2957f5a988b0 100644
--- a/Documentation/linux_tv/media/dvb/legacy_dvb_apis.rst
+++ b/Documentation/media/uapi/dvb/legacy_dvb_apis.rst
diff --git a/Documentation/linux_tv/media/dvb/net-add-if.rst b/Documentation/media/uapi/dvb/net-add-if.rst
index 2b990d0e0fe1..2b990d0e0fe1 100644
--- a/Documentation/linux_tv/media/dvb/net-add-if.rst
+++ b/Documentation/media/uapi/dvb/net-add-if.rst
diff --git a/Documentation/linux_tv/media/dvb/net-get-if.rst b/Documentation/media/uapi/dvb/net-get-if.rst
index 92b884143ccd..92b884143ccd 100644
--- a/Documentation/linux_tv/media/dvb/net-get-if.rst
+++ b/Documentation/media/uapi/dvb/net-get-if.rst
diff --git a/Documentation/linux_tv/media/dvb/net-remove-if.rst b/Documentation/media/uapi/dvb/net-remove-if.rst
index d374c1d63d06..d374c1d63d06 100644
--- a/Documentation/linux_tv/media/dvb/net-remove-if.rst
+++ b/Documentation/media/uapi/dvb/net-remove-if.rst
diff --git a/Documentation/linux_tv/media/dvb/net.rst b/Documentation/media/uapi/dvb/net.rst
index eca42dd53261..eca42dd53261 100644
--- a/Documentation/linux_tv/media/dvb/net.rst
+++ b/Documentation/media/uapi/dvb/net.rst
diff --git a/Documentation/linux_tv/media/dvb/net_h.rst b/Documentation/media/uapi/dvb/net_h.rst
index 7bcf5ba9d1eb..7bcf5ba9d1eb 100644
--- a/Documentation/linux_tv/media/dvb/net_h.rst
+++ b/Documentation/media/uapi/dvb/net_h.rst
diff --git a/Documentation/linux_tv/media/dvb/query-dvb-frontend-info.rst b/Documentation/media/uapi/dvb/query-dvb-frontend-info.rst
index 81cd9b92a36c..81cd9b92a36c 100644
--- a/Documentation/linux_tv/media/dvb/query-dvb-frontend-info.rst
+++ b/Documentation/media/uapi/dvb/query-dvb-frontend-info.rst
diff --git a/Documentation/linux_tv/media/dvb/video-clear-buffer.rst b/Documentation/media/uapi/dvb/video-clear-buffer.rst
index 7c85aa06f013..7c85aa06f013 100644
--- a/Documentation/linux_tv/media/dvb/video-clear-buffer.rst
+++ b/Documentation/media/uapi/dvb/video-clear-buffer.rst
diff --git a/Documentation/linux_tv/media/dvb/video-command.rst b/Documentation/media/uapi/dvb/video-command.rst
index b1634f722cbd..b1634f722cbd 100644
--- a/Documentation/linux_tv/media/dvb/video-command.rst
+++ b/Documentation/media/uapi/dvb/video-command.rst
diff --git a/Documentation/linux_tv/media/dvb/video-continue.rst b/Documentation/media/uapi/dvb/video-continue.rst
index c5acc094986f..c5acc094986f 100644
--- a/Documentation/linux_tv/media/dvb/video-continue.rst
+++ b/Documentation/media/uapi/dvb/video-continue.rst
diff --git a/Documentation/linux_tv/media/dvb/video-fast-forward.rst b/Documentation/media/uapi/dvb/video-fast-forward.rst
index db338e9f5379..db338e9f5379 100644
--- a/Documentation/linux_tv/media/dvb/video-fast-forward.rst
+++ b/Documentation/media/uapi/dvb/video-fast-forward.rst
diff --git a/Documentation/linux_tv/media/dvb/video-fclose.rst b/Documentation/media/uapi/dvb/video-fclose.rst
index ebeaade0c351..ebeaade0c351 100644
--- a/Documentation/linux_tv/media/dvb/video-fclose.rst
+++ b/Documentation/media/uapi/dvb/video-fclose.rst
diff --git a/Documentation/linux_tv/media/dvb/video-fopen.rst b/Documentation/media/uapi/dvb/video-fopen.rst
index 9e5471557b83..9e5471557b83 100644
--- a/Documentation/linux_tv/media/dvb/video-fopen.rst
+++ b/Documentation/media/uapi/dvb/video-fopen.rst
diff --git a/Documentation/linux_tv/media/dvb/video-freeze.rst b/Documentation/media/uapi/dvb/video-freeze.rst
index d3d0dc31281a..d3d0dc31281a 100644
--- a/Documentation/linux_tv/media/dvb/video-freeze.rst
+++ b/Documentation/media/uapi/dvb/video-freeze.rst
diff --git a/Documentation/linux_tv/media/dvb/video-fwrite.rst b/Documentation/media/uapi/dvb/video-fwrite.rst
index 045038f4181e..045038f4181e 100644
--- a/Documentation/linux_tv/media/dvb/video-fwrite.rst
+++ b/Documentation/media/uapi/dvb/video-fwrite.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-capabilities.rst b/Documentation/media/uapi/dvb/video-get-capabilities.rst
index 94cbbba478a8..94cbbba478a8 100644
--- a/Documentation/linux_tv/media/dvb/video-get-capabilities.rst
+++ b/Documentation/media/uapi/dvb/video-get-capabilities.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-event.rst b/Documentation/media/uapi/dvb/video-get-event.rst
index a1484a226518..a1484a226518 100644
--- a/Documentation/linux_tv/media/dvb/video-get-event.rst
+++ b/Documentation/media/uapi/dvb/video-get-event.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-frame-count.rst b/Documentation/media/uapi/dvb/video-get-frame-count.rst
index 4ff100c2ee95..4ff100c2ee95 100644
--- a/Documentation/linux_tv/media/dvb/video-get-frame-count.rst
+++ b/Documentation/media/uapi/dvb/video-get-frame-count.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-frame-rate.rst b/Documentation/media/uapi/dvb/video-get-frame-rate.rst
index 131def962305..131def962305 100644
--- a/Documentation/linux_tv/media/dvb/video-get-frame-rate.rst
+++ b/Documentation/media/uapi/dvb/video-get-frame-rate.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-navi.rst b/Documentation/media/uapi/dvb/video-get-navi.rst
index 6c3034fe5fa2..6c3034fe5fa2 100644
--- a/Documentation/linux_tv/media/dvb/video-get-navi.rst
+++ b/Documentation/media/uapi/dvb/video-get-navi.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-pts.rst b/Documentation/media/uapi/dvb/video-get-pts.rst
index 082612243bbb..082612243bbb 100644
--- a/Documentation/linux_tv/media/dvb/video-get-pts.rst
+++ b/Documentation/media/uapi/dvb/video-get-pts.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-size.rst b/Documentation/media/uapi/dvb/video-get-size.rst
index c75e3c47c471..c75e3c47c471 100644
--- a/Documentation/linux_tv/media/dvb/video-get-size.rst
+++ b/Documentation/media/uapi/dvb/video-get-size.rst
diff --git a/Documentation/linux_tv/media/dvb/video-get-status.rst b/Documentation/media/uapi/dvb/video-get-status.rst
index ab9c2236df7e..ab9c2236df7e 100644
--- a/Documentation/linux_tv/media/dvb/video-get-status.rst
+++ b/Documentation/media/uapi/dvb/video-get-status.rst
diff --git a/Documentation/linux_tv/media/dvb/video-play.rst b/Documentation/media/uapi/dvb/video-play.rst
index 943c4b755372..943c4b755372 100644
--- a/Documentation/linux_tv/media/dvb/video-play.rst
+++ b/Documentation/media/uapi/dvb/video-play.rst
diff --git a/Documentation/linux_tv/media/dvb/video-select-source.rst b/Documentation/media/uapi/dvb/video-select-source.rst
index 0ee0d03dbeb2..0ee0d03dbeb2 100644
--- a/Documentation/linux_tv/media/dvb/video-select-source.rst
+++ b/Documentation/media/uapi/dvb/video-select-source.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-attributes.rst b/Documentation/media/uapi/dvb/video-set-attributes.rst
index 326c5c876e80..326c5c876e80 100644
--- a/Documentation/linux_tv/media/dvb/video-set-attributes.rst
+++ b/Documentation/media/uapi/dvb/video-set-attributes.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-blank.rst b/Documentation/media/uapi/dvb/video-set-blank.rst
index 142ea8817380..142ea8817380 100644
--- a/Documentation/linux_tv/media/dvb/video-set-blank.rst
+++ b/Documentation/media/uapi/dvb/video-set-blank.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-display-format.rst b/Documentation/media/uapi/dvb/video-set-display-format.rst
index 2061ab064977..2061ab064977 100644
--- a/Documentation/linux_tv/media/dvb/video-set-display-format.rst
+++ b/Documentation/media/uapi/dvb/video-set-display-format.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-format.rst b/Documentation/media/uapi/dvb/video-set-format.rst
index 53d66ec462ca..53d66ec462ca 100644
--- a/Documentation/linux_tv/media/dvb/video-set-format.rst
+++ b/Documentation/media/uapi/dvb/video-set-format.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-highlight.rst b/Documentation/media/uapi/dvb/video-set-highlight.rst
index 374f5d895b4d..374f5d895b4d 100644
--- a/Documentation/linux_tv/media/dvb/video-set-highlight.rst
+++ b/Documentation/media/uapi/dvb/video-set-highlight.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-id.rst b/Documentation/media/uapi/dvb/video-set-id.rst
index 9c002d5399ad..9c002d5399ad 100644
--- a/Documentation/linux_tv/media/dvb/video-set-id.rst
+++ b/Documentation/media/uapi/dvb/video-set-id.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-spu-palette.rst b/Documentation/media/uapi/dvb/video-set-spu-palette.rst
index 4b80b6f56219..4b80b6f56219 100644
--- a/Documentation/linux_tv/media/dvb/video-set-spu-palette.rst
+++ b/Documentation/media/uapi/dvb/video-set-spu-palette.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-spu.rst b/Documentation/media/uapi/dvb/video-set-spu.rst
index a6f6924f10c4..a6f6924f10c4 100644
--- a/Documentation/linux_tv/media/dvb/video-set-spu.rst
+++ b/Documentation/media/uapi/dvb/video-set-spu.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-streamtype.rst b/Documentation/media/uapi/dvb/video-set-streamtype.rst
index 75b2e7a6e829..75b2e7a6e829 100644
--- a/Documentation/linux_tv/media/dvb/video-set-streamtype.rst
+++ b/Documentation/media/uapi/dvb/video-set-streamtype.rst
diff --git a/Documentation/linux_tv/media/dvb/video-set-system.rst b/Documentation/media/uapi/dvb/video-set-system.rst
index 9ae0df1f5813..9ae0df1f5813 100644
--- a/Documentation/linux_tv/media/dvb/video-set-system.rst
+++ b/Documentation/media/uapi/dvb/video-set-system.rst
diff --git a/Documentation/linux_tv/media/dvb/video-slowmotion.rst b/Documentation/media/uapi/dvb/video-slowmotion.rst
index 905712844f6a..905712844f6a 100644
--- a/Documentation/linux_tv/media/dvb/video-slowmotion.rst
+++ b/Documentation/media/uapi/dvb/video-slowmotion.rst
diff --git a/Documentation/linux_tv/media/dvb/video-stillpicture.rst b/Documentation/media/uapi/dvb/video-stillpicture.rst
index ed3a2f53b998..ed3a2f53b998 100644
--- a/Documentation/linux_tv/media/dvb/video-stillpicture.rst
+++ b/Documentation/media/uapi/dvb/video-stillpicture.rst
diff --git a/Documentation/linux_tv/media/dvb/video-stop.rst b/Documentation/media/uapi/dvb/video-stop.rst
index ad8d59e06004..ad8d59e06004 100644
--- a/Documentation/linux_tv/media/dvb/video-stop.rst
+++ b/Documentation/media/uapi/dvb/video-stop.rst
diff --git a/Documentation/linux_tv/media/dvb/video-try-command.rst b/Documentation/media/uapi/dvb/video-try-command.rst
index df96c2d7fc6b..df96c2d7fc6b 100644
--- a/Documentation/linux_tv/media/dvb/video-try-command.rst
+++ b/Documentation/media/uapi/dvb/video-try-command.rst
diff --git a/Documentation/linux_tv/media/dvb/video.rst b/Documentation/media/uapi/dvb/video.rst
index 60d43fb7ce22..60d43fb7ce22 100644
--- a/Documentation/linux_tv/media/dvb/video.rst
+++ b/Documentation/media/uapi/dvb/video.rst
diff --git a/Documentation/linux_tv/media/dvb/video_function_calls.rst b/Documentation/media/uapi/dvb/video_function_calls.rst
index 68588ac7fecb..68588ac7fecb 100644
--- a/Documentation/linux_tv/media/dvb/video_function_calls.rst
+++ b/Documentation/media/uapi/dvb/video_function_calls.rst
diff --git a/Documentation/linux_tv/media/dvb/video_h.rst b/Documentation/media/uapi/dvb/video_h.rst
index 3f39b0c4879c..3f39b0c4879c 100644
--- a/Documentation/linux_tv/media/dvb/video_h.rst
+++ b/Documentation/media/uapi/dvb/video_h.rst
diff --git a/Documentation/linux_tv/media/dvb/video_types.rst b/Documentation/media/uapi/dvb/video_types.rst
index 671f365ceeb4..671f365ceeb4 100644
--- a/Documentation/linux_tv/media/dvb/video_types.rst
+++ b/Documentation/media/uapi/dvb/video_types.rst
diff --git a/Documentation/linux_tv/media/fdl-appendix.rst b/Documentation/media/uapi/fdl-appendix.rst
index fd475180fed8..fd475180fed8 100644
--- a/Documentation/linux_tv/media/fdl-appendix.rst
+++ b/Documentation/media/uapi/fdl-appendix.rst
diff --git a/Documentation/linux_tv/media/gen-errors.rst b/Documentation/media/uapi/gen-errors.rst
index 6cd5d26f32ab..6cd5d26f32ab 100644
--- a/Documentation/linux_tv/media/gen-errors.rst
+++ b/Documentation/media/uapi/gen-errors.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-controller-intro.rst b/Documentation/media/uapi/mediactl/media-controller-intro.rst
index 3e776c0d8276..3e776c0d8276 100644
--- a/Documentation/linux_tv/media/mediactl/media-controller-intro.rst
+++ b/Documentation/media/uapi/mediactl/media-controller-intro.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-controller-model.rst b/Documentation/media/uapi/mediactl/media-controller-model.rst
index 558273cf9570..558273cf9570 100644
--- a/Documentation/linux_tv/media/mediactl/media-controller-model.rst
+++ b/Documentation/media/uapi/mediactl/media-controller-model.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-controller.rst b/Documentation/media/uapi/mediactl/media-controller.rst
index 8758308997a7..8758308997a7 100644
--- a/Documentation/linux_tv/media/mediactl/media-controller.rst
+++ b/Documentation/media/uapi/mediactl/media-controller.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-func-close.rst b/Documentation/media/uapi/mediactl/media-func-close.rst
index 39ef70ac8656..39ef70ac8656 100644
--- a/Documentation/linux_tv/media/mediactl/media-func-close.rst
+++ b/Documentation/media/uapi/mediactl/media-func-close.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-func-ioctl.rst b/Documentation/media/uapi/mediactl/media-func-ioctl.rst
index 9d1b23133edf..9d1b23133edf 100644
--- a/Documentation/linux_tv/media/mediactl/media-func-ioctl.rst
+++ b/Documentation/media/uapi/mediactl/media-func-ioctl.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-func-open.rst b/Documentation/media/uapi/mediactl/media-func-open.rst
index 2b2ecd85b995..2b2ecd85b995 100644
--- a/Documentation/linux_tv/media/mediactl/media-func-open.rst
+++ b/Documentation/media/uapi/mediactl/media-func-open.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-ioc-device-info.rst b/Documentation/media/uapi/mediactl/media-ioc-device-info.rst
index cee8312bde7d..cee8312bde7d 100644
--- a/Documentation/linux_tv/media/mediactl/media-ioc-device-info.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-device-info.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-ioc-enum-entities.rst b/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst
index ae88f46b3a9e..ae88f46b3a9e 100644
--- a/Documentation/linux_tv/media/mediactl/media-ioc-enum-entities.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-ioc-enum-links.rst b/Documentation/media/uapi/mediactl/media-ioc-enum-links.rst
index cc3cc3d2400b..cc3cc3d2400b 100644
--- a/Documentation/linux_tv/media/mediactl/media-ioc-enum-links.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-enum-links.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-ioc-g-topology.rst b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
index 1f2d530aa284..1f2d530aa284 100644
--- a/Documentation/linux_tv/media/mediactl/media-ioc-g-topology.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-ioc-setup-link.rst b/Documentation/media/uapi/mediactl/media-ioc-setup-link.rst
index 57ae5bcc646a..57ae5bcc646a 100644
--- a/Documentation/linux_tv/media/mediactl/media-ioc-setup-link.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-setup-link.rst
diff --git a/Documentation/linux_tv/media/mediactl/media-types.rst b/Documentation/media/uapi/mediactl/media-types.rst
index a35fc15a3137..a35fc15a3137 100644
--- a/Documentation/linux_tv/media/mediactl/media-types.rst
+++ b/Documentation/media/uapi/mediactl/media-types.rst
diff --git a/Documentation/linux_tv/media/rc/Remote_controllers_Intro.rst b/Documentation/media/uapi/rc/Remote_controllers_Intro.rst
index 3707c29d37ed..3707c29d37ed 100644
--- a/Documentation/linux_tv/media/rc/Remote_controllers_Intro.rst
+++ b/Documentation/media/uapi/rc/Remote_controllers_Intro.rst
diff --git a/Documentation/linux_tv/media/rc/Remote_controllers_table_change.rst b/Documentation/media/uapi/rc/Remote_controllers_table_change.rst
index d604896bca87..d604896bca87 100644
--- a/Documentation/linux_tv/media/rc/Remote_controllers_table_change.rst
+++ b/Documentation/media/uapi/rc/Remote_controllers_table_change.rst
diff --git a/Documentation/linux_tv/media/rc/Remote_controllers_tables.rst b/Documentation/media/uapi/rc/Remote_controllers_tables.rst
index 0bb16c4af27d..0bb16c4af27d 100644
--- a/Documentation/linux_tv/media/rc/Remote_controllers_tables.rst
+++ b/Documentation/media/uapi/rc/Remote_controllers_tables.rst
diff --git a/Documentation/linux_tv/media/rc/keytable.c.rst b/Documentation/media/uapi/rc/keytable.c.rst
index 5718ffa011d4..e6ce1e3f5a78 100644
--- a/Documentation/linux_tv/media/rc/keytable.c.rst
+++ b/Documentation/media/uapi/rc/keytable.c.rst
@@ -1,7 +1,7 @@
 .. -*- coding: utf-8; mode: rst -*-
 
-file: media/v4l/keytable.c
-==========================
+file: uapi/v4l/keytable.c
+=========================
 
 .. code-block:: c
 
diff --git a/Documentation/linux_tv/media/rc/lirc_dev_intro.rst b/Documentation/media/uapi/rc/lirc_dev_intro.rst
index 9a784c8fe4ea..9a784c8fe4ea 100644
--- a/Documentation/linux_tv/media/rc/lirc_dev_intro.rst
+++ b/Documentation/media/uapi/rc/lirc_dev_intro.rst
diff --git a/Documentation/linux_tv/media/rc/lirc_device_interface.rst b/Documentation/media/uapi/rc/lirc_device_interface.rst
index a0c27ed5ad73..a0c27ed5ad73 100644
--- a/Documentation/linux_tv/media/rc/lirc_device_interface.rst
+++ b/Documentation/media/uapi/rc/lirc_device_interface.rst
diff --git a/Documentation/linux_tv/media/rc/lirc_ioctl.rst b/Documentation/media/uapi/rc/lirc_ioctl.rst
index 916d064476f1..916d064476f1 100644
--- a/Documentation/linux_tv/media/rc/lirc_ioctl.rst
+++ b/Documentation/media/uapi/rc/lirc_ioctl.rst
diff --git a/Documentation/linux_tv/media/rc/lirc_read.rst b/Documentation/media/uapi/rc/lirc_read.rst
index b0b76c3d1d9a..b0b76c3d1d9a 100644
--- a/Documentation/linux_tv/media/rc/lirc_read.rst
+++ b/Documentation/media/uapi/rc/lirc_read.rst
diff --git a/Documentation/linux_tv/media/rc/lirc_write.rst b/Documentation/media/uapi/rc/lirc_write.rst
index d19cb486ecc9..d19cb486ecc9 100644
--- a/Documentation/linux_tv/media/rc/lirc_write.rst
+++ b/Documentation/media/uapi/rc/lirc_write.rst
diff --git a/Documentation/linux_tv/media/rc/remote_controllers.rst b/Documentation/media/uapi/rc/remote_controllers.rst
index bccceb1e28c3..bccceb1e28c3 100644
--- a/Documentation/linux_tv/media/rc/remote_controllers.rst
+++ b/Documentation/media/uapi/rc/remote_controllers.rst
diff --git a/Documentation/linux_tv/media/rc/remote_controllers_sysfs_nodes.rst b/Documentation/media/uapi/rc/remote_controllers_sysfs_nodes.rst
index 6fb944fe21fd..6fb944fe21fd 100644
--- a/Documentation/linux_tv/media/rc/remote_controllers_sysfs_nodes.rst
+++ b/Documentation/media/uapi/rc/remote_controllers_sysfs_nodes.rst
diff --git a/Documentation/linux_tv/media/v4l/app-pri.rst b/Documentation/media/uapi/v4l/app-pri.rst
index a8c41a7ec396..a8c41a7ec396 100644
--- a/Documentation/linux_tv/media/v4l/app-pri.rst
+++ b/Documentation/media/uapi/v4l/app-pri.rst
diff --git a/Documentation/linux_tv/media/v4l/async.rst b/Documentation/media/uapi/v4l/async.rst
index 5affc0adb95b..5affc0adb95b 100644
--- a/Documentation/linux_tv/media/v4l/async.rst
+++ b/Documentation/media/uapi/v4l/async.rst
diff --git a/Documentation/linux_tv/media/v4l/audio.rst b/Documentation/media/uapi/v4l/audio.rst
index 71502f0bf8bd..71502f0bf8bd 100644
--- a/Documentation/linux_tv/media/v4l/audio.rst
+++ b/Documentation/media/uapi/v4l/audio.rst
diff --git a/Documentation/linux_tv/media/v4l/biblio.rst b/Documentation/media/uapi/v4l/biblio.rst
index e911df972d40..e911df972d40 100644
--- a/Documentation/linux_tv/media/v4l/biblio.rst
+++ b/Documentation/media/uapi/v4l/biblio.rst
diff --git a/Documentation/linux_tv/media/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
index b195eb5b63a1..b195eb5b63a1 100644
--- a/Documentation/linux_tv/media/v4l/buffer.rst
+++ b/Documentation/media/uapi/v4l/buffer.rst
diff --git a/Documentation/linux_tv/media/v4l/capture-example.rst b/Documentation/media/uapi/v4l/capture-example.rst
index ac1cd057e25b..ac1cd057e25b 100644
--- a/Documentation/linux_tv/media/v4l/capture-example.rst
+++ b/Documentation/media/uapi/v4l/capture-example.rst
diff --git a/Documentation/linux_tv/media/v4l/capture.c.rst b/Documentation/media/uapi/v4l/capture.c.rst
index 56525a0fb2fa..56525a0fb2fa 100644
--- a/Documentation/linux_tv/media/v4l/capture.c.rst
+++ b/Documentation/media/uapi/v4l/capture.c.rst
diff --git a/Documentation/linux_tv/media/v4l/colorspaces.rst b/Documentation/media/uapi/v4l/colorspaces.rst
index 322eb94c1d44..322eb94c1d44 100644
--- a/Documentation/linux_tv/media/v4l/colorspaces.rst
+++ b/Documentation/media/uapi/v4l/colorspaces.rst
diff --git a/Documentation/linux_tv/media/v4l/common-defs.rst b/Documentation/media/uapi/v4l/common-defs.rst
index 39058216b630..39058216b630 100644
--- a/Documentation/linux_tv/media/v4l/common-defs.rst
+++ b/Documentation/media/uapi/v4l/common-defs.rst
diff --git a/Documentation/linux_tv/media/v4l/common.rst b/Documentation/media/uapi/v4l/common.rst
index 13f2ed3fc5a6..13f2ed3fc5a6 100644
--- a/Documentation/linux_tv/media/v4l/common.rst
+++ b/Documentation/media/uapi/v4l/common.rst
diff --git a/Documentation/linux_tv/media/v4l/compat.rst b/Documentation/media/uapi/v4l/compat.rst
index 8b5e1cebd8f4..8b5e1cebd8f4 100644
--- a/Documentation/linux_tv/media/v4l/compat.rst
+++ b/Documentation/media/uapi/v4l/compat.rst
diff --git a/Documentation/linux_tv/media/v4l/control.rst b/Documentation/media/uapi/v4l/control.rst
index 6cf218ab36fb..6cf218ab36fb 100644
--- a/Documentation/linux_tv/media/v4l/control.rst
+++ b/Documentation/media/uapi/v4l/control.rst
diff --git a/Documentation/linux_tv/media/v4l/crop.rst b/Documentation/media/uapi/v4l/crop.rst
index ed43b36c51d8..ed43b36c51d8 100644
--- a/Documentation/linux_tv/media/v4l/crop.rst
+++ b/Documentation/media/uapi/v4l/crop.rst
diff --git a/Documentation/linux_tv/media/v4l/crop_files/crop.gif b/Documentation/media/uapi/v4l/crop_files/crop.gif
index 3b9e7d836d4b..3b9e7d836d4b 100644
--- a/Documentation/linux_tv/media/v4l/crop_files/crop.gif
+++ b/Documentation/media/uapi/v4l/crop_files/crop.gif
diff --git a/Documentation/linux_tv/media/v4l/crop_files/crop.pdf b/Documentation/media/uapi/v4l/crop_files/crop.pdf
index c9fb81cd32f3..c9fb81cd32f3 100644
--- a/Documentation/linux_tv/media/v4l/crop_files/crop.pdf
+++ b/Documentation/media/uapi/v4l/crop_files/crop.pdf
diff --git a/Documentation/linux_tv/media/v4l/depth-formats.rst b/Documentation/media/uapi/v4l/depth-formats.rst
index 82f183870aae..82f183870aae 100644
--- a/Documentation/linux_tv/media/v4l/depth-formats.rst
+++ b/Documentation/media/uapi/v4l/depth-formats.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-capture.rst b/Documentation/media/uapi/v4l/dev-capture.rst
index 16030a8354fd..16030a8354fd 100644
--- a/Documentation/linux_tv/media/v4l/dev-capture.rst
+++ b/Documentation/media/uapi/v4l/dev-capture.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-codec.rst b/Documentation/media/uapi/v4l/dev-codec.rst
index 7fd28d085c2c..7fd28d085c2c 100644
--- a/Documentation/linux_tv/media/v4l/dev-codec.rst
+++ b/Documentation/media/uapi/v4l/dev-codec.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-effect.rst b/Documentation/media/uapi/v4l/dev-effect.rst
index be4de3b0a025..be4de3b0a025 100644
--- a/Documentation/linux_tv/media/v4l/dev-effect.rst
+++ b/Documentation/media/uapi/v4l/dev-effect.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-event.rst b/Documentation/media/uapi/v4l/dev-event.rst
index a06ec4d65359..a06ec4d65359 100644
--- a/Documentation/linux_tv/media/v4l/dev-event.rst
+++ b/Documentation/media/uapi/v4l/dev-event.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-osd.rst b/Documentation/media/uapi/v4l/dev-osd.rst
index b9b53fd7eb5d..b9b53fd7eb5d 100644
--- a/Documentation/linux_tv/media/v4l/dev-osd.rst
+++ b/Documentation/media/uapi/v4l/dev-osd.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-output.rst b/Documentation/media/uapi/v4l/dev-output.rst
index 5063be7d4938..5063be7d4938 100644
--- a/Documentation/linux_tv/media/v4l/dev-output.rst
+++ b/Documentation/media/uapi/v4l/dev-output.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-overlay.rst b/Documentation/media/uapi/v4l/dev-overlay.rst
index bed00bf34982..bed00bf34982 100644
--- a/Documentation/linux_tv/media/v4l/dev-overlay.rst
+++ b/Documentation/media/uapi/v4l/dev-overlay.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-radio.rst b/Documentation/media/uapi/v4l/dev-radio.rst
index 5ff7cded2591..5ff7cded2591 100644
--- a/Documentation/linux_tv/media/v4l/dev-radio.rst
+++ b/Documentation/media/uapi/v4l/dev-radio.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-raw-vbi.rst b/Documentation/media/uapi/v4l/dev-raw-vbi.rst
index da85be88d57e..da85be88d57e 100644
--- a/Documentation/linux_tv/media/v4l/dev-raw-vbi.rst
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_525.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif
index 5580b690d504..5580b690d504 100644
--- a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_525.gif
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif
diff --git a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_525.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf
index 9e72c25b208d..9e72c25b208d 100644
--- a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_525.pdf
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf
diff --git a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_625.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif
index 34e3251983c4..34e3251983c4 100644
--- a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_625.gif
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif
diff --git a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_625.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
index 765235e33a4d..765235e33a4d 100644
--- a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_625.pdf
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
diff --git a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_hsync.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif
index b02434d3b356..b02434d3b356 100644
--- a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_hsync.gif
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif
diff --git a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_hsync.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf
index 200b668189bf..200b668189bf 100644
--- a/Documentation/linux_tv/media/v4l/dev-raw-vbi_files/vbi_hsync.pdf
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf
diff --git a/Documentation/linux_tv/media/v4l/dev-rds.rst b/Documentation/media/uapi/v4l/dev-rds.rst
index 6a0b1a874668..6a0b1a874668 100644
--- a/Documentation/linux_tv/media/v4l/dev-rds.rst
+++ b/Documentation/media/uapi/v4l/dev-rds.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-sdr.rst b/Documentation/media/uapi/v4l/dev-sdr.rst
index fc4053f957fb..fc4053f957fb 100644
--- a/Documentation/linux_tv/media/v4l/dev-sdr.rst
+++ b/Documentation/media/uapi/v4l/dev-sdr.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-sliced-vbi.rst b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
index fbd04fee0484..fbd04fee0484 100644
--- a/Documentation/linux_tv/media/v4l/dev-sliced-vbi.rst
+++ b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst
index 39d3d860dda4..39d3d860dda4 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev.rst
+++ b/Documentation/media/uapi/v4l/dev-subdev.rst
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/pipeline.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf
index ee3e37f04b6a..ee3e37f04b6a 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/pipeline.pdf
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/pipeline.png b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png
index f19b86c2c24d..f19b86c2c24d 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/pipeline.png
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-crop.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
index 29a806f839b4..29a806f839b4 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg
index 18b0f5de9ed2..18b0f5de9ed2 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-crop.svg
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-full.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf
index b78a8e8f6b35..b78a8e8f6b35 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-full.pdf
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-full.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg
index 3322cf4c0093..3322cf4c0093 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-full.svg
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
index 8f7a95b6eb4d..8f7a95b6eb4d 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
diff --git a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
index 2340c0f8bc92..2340c0f8bc92 100644
--- a/Documentation/linux_tv/media/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
+++ b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
diff --git a/Documentation/linux_tv/media/v4l/dev-teletext.rst b/Documentation/media/uapi/v4l/dev-teletext.rst
index 2648f6b37ea3..2648f6b37ea3 100644
--- a/Documentation/linux_tv/media/v4l/dev-teletext.rst
+++ b/Documentation/media/uapi/v4l/dev-teletext.rst
diff --git a/Documentation/linux_tv/media/v4l/devices.rst b/Documentation/media/uapi/v4l/devices.rst
index aed0ce11d1f8..aed0ce11d1f8 100644
--- a/Documentation/linux_tv/media/v4l/devices.rst
+++ b/Documentation/media/uapi/v4l/devices.rst
diff --git a/Documentation/linux_tv/media/v4l/diff-v4l.rst b/Documentation/media/uapi/v4l/diff-v4l.rst
index 5f45ec123162..5f45ec123162 100644
--- a/Documentation/linux_tv/media/v4l/diff-v4l.rst
+++ b/Documentation/media/uapi/v4l/diff-v4l.rst
diff --git a/Documentation/linux_tv/media/v4l/dmabuf.rst b/Documentation/media/uapi/v4l/dmabuf.rst
index 474d8c021507..474d8c021507 100644
--- a/Documentation/linux_tv/media/v4l/dmabuf.rst
+++ b/Documentation/media/uapi/v4l/dmabuf.rst
diff --git a/Documentation/linux_tv/media/v4l/driver.rst b/Documentation/media/uapi/v4l/driver.rst
index 2319b383f0a4..2319b383f0a4 100644
--- a/Documentation/linux_tv/media/v4l/driver.rst
+++ b/Documentation/media/uapi/v4l/driver.rst
diff --git a/Documentation/linux_tv/media/v4l/dv-timings.rst b/Documentation/media/uapi/v4l/dv-timings.rst
index 415a0c4e2ccb..415a0c4e2ccb 100644
--- a/Documentation/linux_tv/media/v4l/dv-timings.rst
+++ b/Documentation/media/uapi/v4l/dv-timings.rst
diff --git a/Documentation/linux_tv/media/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst
index 26eb6ee851c3..26eb6ee851c3 100644
--- a/Documentation/linux_tv/media/v4l/extended-controls.rst
+++ b/Documentation/media/uapi/v4l/extended-controls.rst
diff --git a/Documentation/linux_tv/media/v4l/field-order.rst b/Documentation/media/uapi/v4l/field-order.rst
index 979fedbb2bda..979fedbb2bda 100644
--- a/Documentation/linux_tv/media/v4l/field-order.rst
+++ b/Documentation/media/uapi/v4l/field-order.rst
diff --git a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_bt.gif b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif
index 60e8569a76c9..60e8569a76c9 100644
--- a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_bt.gif
+++ b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif
diff --git a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_bt.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf
index 26598b23f80d..26598b23f80d 100644
--- a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_bt.pdf
+++ b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf
diff --git a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_tb.gif b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif
index 718492f1cfc7..718492f1cfc7 100644
--- a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_tb.gif
+++ b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif
diff --git a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_tb.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf
index 4965b22ddb3a..4965b22ddb3a 100644
--- a/Documentation/linux_tv/media/v4l/field-order_files/fieldseq_tb.pdf
+++ b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf
diff --git a/Documentation/linux_tv/media/v4l/format.rst b/Documentation/media/uapi/v4l/format.rst
index a29dd9466b8f..a29dd9466b8f 100644
--- a/Documentation/linux_tv/media/v4l/format.rst
+++ b/Documentation/media/uapi/v4l/format.rst
diff --git a/Documentation/linux_tv/media/v4l/func-close.rst b/Documentation/media/uapi/v4l/func-close.rst
index 926a2ccc32e5..926a2ccc32e5 100644
--- a/Documentation/linux_tv/media/v4l/func-close.rst
+++ b/Documentation/media/uapi/v4l/func-close.rst
diff --git a/Documentation/linux_tv/media/v4l/func-ioctl.rst b/Documentation/media/uapi/v4l/func-ioctl.rst
index 5632f48fce1b..5632f48fce1b 100644
--- a/Documentation/linux_tv/media/v4l/func-ioctl.rst
+++ b/Documentation/media/uapi/v4l/func-ioctl.rst
diff --git a/Documentation/linux_tv/media/v4l/func-mmap.rst b/Documentation/media/uapi/v4l/func-mmap.rst
index 3502c2afd894..3502c2afd894 100644
--- a/Documentation/linux_tv/media/v4l/func-mmap.rst
+++ b/Documentation/media/uapi/v4l/func-mmap.rst
diff --git a/Documentation/linux_tv/media/v4l/func-munmap.rst b/Documentation/media/uapi/v4l/func-munmap.rst
index c29c03f21279..c29c03f21279 100644
--- a/Documentation/linux_tv/media/v4l/func-munmap.rst
+++ b/Documentation/media/uapi/v4l/func-munmap.rst
diff --git a/Documentation/linux_tv/media/v4l/func-open.rst b/Documentation/media/uapi/v4l/func-open.rst
index 06bcadc269a4..06bcadc269a4 100644
--- a/Documentation/linux_tv/media/v4l/func-open.rst
+++ b/Documentation/media/uapi/v4l/func-open.rst
diff --git a/Documentation/linux_tv/media/v4l/func-poll.rst b/Documentation/media/uapi/v4l/func-poll.rst
index e6ceb712b783..e6ceb712b783 100644
--- a/Documentation/linux_tv/media/v4l/func-poll.rst
+++ b/Documentation/media/uapi/v4l/func-poll.rst
diff --git a/Documentation/linux_tv/media/v4l/func-read.rst b/Documentation/media/uapi/v4l/func-read.rst
index 9a2aa5210233..9a2aa5210233 100644
--- a/Documentation/linux_tv/media/v4l/func-read.rst
+++ b/Documentation/media/uapi/v4l/func-read.rst
diff --git a/Documentation/linux_tv/media/v4l/func-select.rst b/Documentation/media/uapi/v4l/func-select.rst
index 954dd00b8301..954dd00b8301 100644
--- a/Documentation/linux_tv/media/v4l/func-select.rst
+++ b/Documentation/media/uapi/v4l/func-select.rst
diff --git a/Documentation/linux_tv/media/v4l/func-write.rst b/Documentation/media/uapi/v4l/func-write.rst
index a3bc9b26fe56..a3bc9b26fe56 100644
--- a/Documentation/linux_tv/media/v4l/func-write.rst
+++ b/Documentation/media/uapi/v4l/func-write.rst
diff --git a/Documentation/linux_tv/media/v4l/hist-v4l2.rst b/Documentation/media/uapi/v4l/hist-v4l2.rst
index a571e099fde7..a571e099fde7 100644
--- a/Documentation/linux_tv/media/v4l/hist-v4l2.rst
+++ b/Documentation/media/uapi/v4l/hist-v4l2.rst
diff --git a/Documentation/linux_tv/media/v4l/io.rst b/Documentation/media/uapi/v4l/io.rst
index 94b38a10ee65..94b38a10ee65 100644
--- a/Documentation/linux_tv/media/v4l/io.rst
+++ b/Documentation/media/uapi/v4l/io.rst
diff --git a/Documentation/linux_tv/media/v4l/libv4l-introduction.rst b/Documentation/media/uapi/v4l/libv4l-introduction.rst
index 61d085f9f105..61d085f9f105 100644
--- a/Documentation/linux_tv/media/v4l/libv4l-introduction.rst
+++ b/Documentation/media/uapi/v4l/libv4l-introduction.rst
diff --git a/Documentation/linux_tv/media/v4l/libv4l.rst b/Documentation/media/uapi/v4l/libv4l.rst
index 332c1d42688b..332c1d42688b 100644
--- a/Documentation/linux_tv/media/v4l/libv4l.rst
+++ b/Documentation/media/uapi/v4l/libv4l.rst
diff --git a/Documentation/linux_tv/media/v4l/mmap.rst b/Documentation/media/uapi/v4l/mmap.rst
index 2171b18c1aab..2171b18c1aab 100644
--- a/Documentation/linux_tv/media/v4l/mmap.rst
+++ b/Documentation/media/uapi/v4l/mmap.rst
diff --git a/Documentation/linux_tv/media/v4l/open.rst b/Documentation/media/uapi/v4l/open.rst
index a3e39df91e9d..a3e39df91e9d 100644
--- a/Documentation/linux_tv/media/v4l/open.rst
+++ b/Documentation/media/uapi/v4l/open.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-002.rst b/Documentation/media/uapi/v4l/pixfmt-002.rst
index fae9b2d40a85..fae9b2d40a85 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-002.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-002.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-003.rst b/Documentation/media/uapi/v4l/pixfmt-003.rst
index 25c54872fbe1..25c54872fbe1 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-003.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-003.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-004.rst b/Documentation/media/uapi/v4l/pixfmt-004.rst
index 4bc116aa8193..4bc116aa8193 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-004.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-004.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-006.rst b/Documentation/media/uapi/v4l/pixfmt-006.rst
index b9e7c6844020..b9e7c6844020 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-006.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-006.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-007.rst b/Documentation/media/uapi/v4l/pixfmt-007.rst
index 5e39cda6147a..5e39cda6147a 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-007.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-007.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-008.rst b/Documentation/media/uapi/v4l/pixfmt-008.rst
index 4bec79784bdd..4bec79784bdd 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-008.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-008.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-013.rst b/Documentation/media/uapi/v4l/pixfmt-013.rst
index 475f6e6fe785..475f6e6fe785 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-013.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-013.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-grey.rst b/Documentation/media/uapi/v4l/pixfmt-grey.rst
index 761d783d4989..761d783d4989 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-grey.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-grey.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-indexed.rst b/Documentation/media/uapi/v4l/pixfmt-indexed.rst
index 99a780fe6b61..99a780fe6b61 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-indexed.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-indexed.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-m420.rst b/Documentation/media/uapi/v4l/pixfmt-m420.rst
index 4c5b2969c039..4c5b2969c039 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-m420.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-m420.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv12.rst b/Documentation/media/uapi/v4l/pixfmt-nv12.rst
index cf59b28f75b7..cf59b28f75b7 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv12.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv12m.rst b/Documentation/media/uapi/v4l/pixfmt-nv12m.rst
index a4e7eaeccea8..a4e7eaeccea8 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv12m.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv12m.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv12mt.rst b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst
index 6198941bb814..6198941bb814 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv12mt.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv12mt_files/nv12mt.gif b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif
index ef2d4cf8367b..ef2d4cf8367b 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv12mt_files/nv12mt.gif
+++ b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv12mt_files/nv12mt_example.gif b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif
index df81d68108ee..df81d68108ee 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv12mt_files/nv12mt_example.gif
+++ b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv16.rst b/Documentation/media/uapi/v4l/pixfmt-nv16.rst
index 88aa7617f7cf..88aa7617f7cf 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv16.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv16m.rst b/Documentation/media/uapi/v4l/pixfmt-nv16m.rst
index b7ee068f491c..b7ee068f491c 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv16m.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv16m.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-nv24.rst b/Documentation/media/uapi/v4l/pixfmt-nv24.rst
index db98f476446e..db98f476446e 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-nv24.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv24.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-packed-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
index c7aa2e91ac78..c7aa2e91ac78 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-packed-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-packed-yuv.rst b/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
index 54716455f453..54716455f453 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-packed-yuv.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-reserved.rst b/Documentation/media/uapi/v4l/pixfmt-reserved.rst
index 9a5704baf9fe..9a5704baf9fe 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-reserved.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-reserved.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index 4b3651cc0a96..4b3651cc0a96 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sbggr16.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
index 2cfcc97b3c96..2cfcc97b3c96 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sbggr16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sbggr8.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
index db4c523f49a9..db4c523f49a9 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sbggr8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cs08.rst b/Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst
index 2736275d080f..2736275d080f 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cs08.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cs14le.rst b/Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst
index bfe5804bd84e..bfe5804bd84e 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cs14le.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cu08.rst b/Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst
index 68ad1717f6d7..68ad1717f6d7 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cu08.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cu16le.rst b/Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst
index 2a1c0d4924a1..2a1c0d4924a1 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sdr-cu16le.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sdr-ru12le.rst b/Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst
index 378581b27d4a..378581b27d4a 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sdr-ru12le.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sgbrg8.rst b/Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
index 6345c24d86f3..6345c24d86f3 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sgbrg8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-sgrbg8.rst b/Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
index 51b7b8ef7519..51b7b8ef7519 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-sgrbg8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-srggb10.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10.rst
index 44a49563917c..44a49563917c 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-srggb10.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-srggb10alaw8.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10alaw8.rst
index 68bae0cb764c..68bae0cb764c 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-srggb10alaw8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10alaw8.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-srggb10dpcm8.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10dpcm8.rst
index 5e041d02eff0..5e041d02eff0 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-srggb10dpcm8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10dpcm8.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-srggb10p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
index d71368f69087..d71368f69087 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-srggb10p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-srggb12.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
index f5303ab9e79c..f5303ab9e79c 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-srggb12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-srggb8.rst b/Documentation/media/uapi/v4l/pixfmt-srggb8.rst
index e88de4c48d47..e88de4c48d47 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-srggb8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb8.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-uv8.rst b/Documentation/media/uapi/v4l/pixfmt-uv8.rst
index fa8f7ee9fee1..fa8f7ee9fee1 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-uv8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-uv8.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-uyvy.rst b/Documentation/media/uapi/v4l/pixfmt-uyvy.rst
index 87b0081d44ee..87b0081d44ee 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-uyvy.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-uyvy.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-vyuy.rst b/Documentation/media/uapi/v4l/pixfmt-vyuy.rst
index 5d8f99f173b6..5d8f99f173b6 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-vyuy.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-vyuy.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y10.rst b/Documentation/media/uapi/v4l/pixfmt-y10.rst
index d22f77138289..d22f77138289 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y10.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y10.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y10b.rst b/Documentation/media/uapi/v4l/pixfmt-y10b.rst
index 5b50cd61e654..5b50cd61e654 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y10b.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y10b.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y12.rst b/Documentation/media/uapi/v4l/pixfmt-y12.rst
index 7729bcbf3350..7729bcbf3350 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y12.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y12i.rst b/Documentation/media/uapi/v4l/pixfmt-y12i.rst
index 8967e8c33b47..8967e8c33b47 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y12i.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y12i.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y16-be.rst b/Documentation/media/uapi/v4l/pixfmt-y16-be.rst
index 0c61a10018c2..0c61a10018c2 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y16-be.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y16-be.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y16.rst b/Documentation/media/uapi/v4l/pixfmt-y16.rst
index a8d4b7192ae3..a8d4b7192ae3 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y16.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y41p.rst b/Documentation/media/uapi/v4l/pixfmt-y41p.rst
index 4760174a4668..4760174a4668 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y41p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y41p.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-y8i.rst b/Documentation/media/uapi/v4l/pixfmt-y8i.rst
index 7fa16ee85ab7..7fa16ee85ab7 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-y8i.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y8i.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuv410.rst b/Documentation/media/uapi/v4l/pixfmt-yuv410.rst
index 8a5d1a2ee005..8a5d1a2ee005 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuv410.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuv410.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuv411p.rst b/Documentation/media/uapi/v4l/pixfmt-yuv411p.rst
index f85e3f388cbe..f85e3f388cbe 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuv411p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuv411p.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuv420.rst b/Documentation/media/uapi/v4l/pixfmt-yuv420.rst
index b22e64c14f67..b22e64c14f67 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuv420.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuv420.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuv420m.rst b/Documentation/media/uapi/v4l/pixfmt-yuv420m.rst
index 4dab85090d7d..4dab85090d7d 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuv420m.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuv420m.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuv422m.rst b/Documentation/media/uapi/v4l/pixfmt-yuv422m.rst
index ccb67284133a..ccb67284133a 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuv422m.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuv422m.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuv422p.rst b/Documentation/media/uapi/v4l/pixfmt-yuv422p.rst
index 9f34762adf18..9f34762adf18 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuv422p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuv422p.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuv444m.rst b/Documentation/media/uapi/v4l/pixfmt-yuv444m.rst
index 04f34508b934..04f34508b934 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuv444m.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuv444m.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yuyv.rst b/Documentation/media/uapi/v4l/pixfmt-yuyv.rst
index 52917dfa9261..52917dfa9261 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yuyv.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yuyv.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-yvyu.rst b/Documentation/media/uapi/v4l/pixfmt-yvyu.rst
index e466052b68b2..e466052b68b2 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-yvyu.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-yvyu.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt-z16.rst b/Documentation/media/uapi/v4l/pixfmt-z16.rst
index c5cce2db78b6..c5cce2db78b6 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt-z16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-z16.rst
diff --git a/Documentation/linux_tv/media/v4l/pixfmt.rst b/Documentation/media/uapi/v4l/pixfmt.rst
index 81222a99f7ce..81222a99f7ce 100644
--- a/Documentation/linux_tv/media/v4l/pixfmt.rst
+++ b/Documentation/media/uapi/v4l/pixfmt.rst
diff --git a/Documentation/linux_tv/media/v4l/planar-apis.rst b/Documentation/media/uapi/v4l/planar-apis.rst
index 5fe2e1188230..5fe2e1188230 100644
--- a/Documentation/linux_tv/media/v4l/planar-apis.rst
+++ b/Documentation/media/uapi/v4l/planar-apis.rst
diff --git a/Documentation/linux_tv/media/v4l/querycap.rst b/Documentation/media/uapi/v4l/querycap.rst
index c19cce7a816f..c19cce7a816f 100644
--- a/Documentation/linux_tv/media/v4l/querycap.rst
+++ b/Documentation/media/uapi/v4l/querycap.rst
diff --git a/Documentation/linux_tv/media/v4l/rw.rst b/Documentation/media/uapi/v4l/rw.rst
index 66ba54648c45..66ba54648c45 100644
--- a/Documentation/linux_tv/media/v4l/rw.rst
+++ b/Documentation/media/uapi/v4l/rw.rst
diff --git a/Documentation/linux_tv/media/v4l/sdr-formats.rst b/Documentation/media/uapi/v4l/sdr-formats.rst
index f863c08f1add..f863c08f1add 100644
--- a/Documentation/linux_tv/media/v4l/sdr-formats.rst
+++ b/Documentation/media/uapi/v4l/sdr-formats.rst
diff --git a/Documentation/linux_tv/media/v4l/selection-api-002.rst b/Documentation/media/uapi/v4l/selection-api-002.rst
index 09ca93f91bf7..09ca93f91bf7 100644
--- a/Documentation/linux_tv/media/v4l/selection-api-002.rst
+++ b/Documentation/media/uapi/v4l/selection-api-002.rst
diff --git a/Documentation/linux_tv/media/v4l/selection-api-003.rst b/Documentation/media/uapi/v4l/selection-api-003.rst
index 15cb3b79f12c..15cb3b79f12c 100644
--- a/Documentation/linux_tv/media/v4l/selection-api-003.rst
+++ b/Documentation/media/uapi/v4l/selection-api-003.rst
diff --git a/Documentation/linux_tv/media/v4l/selection-api-003_files/selection.png b/Documentation/media/uapi/v4l/selection-api-003_files/selection.png
index bfc523eae570..bfc523eae570 100644
--- a/Documentation/linux_tv/media/v4l/selection-api-003_files/selection.png
+++ b/Documentation/media/uapi/v4l/selection-api-003_files/selection.png
diff --git a/Documentation/linux_tv/media/v4l/selection-api-004.rst b/Documentation/media/uapi/v4l/selection-api-004.rst
index d782cd5b2117..d782cd5b2117 100644
--- a/Documentation/linux_tv/media/v4l/selection-api-004.rst
+++ b/Documentation/media/uapi/v4l/selection-api-004.rst
diff --git a/Documentation/linux_tv/media/v4l/selection-api-005.rst b/Documentation/media/uapi/v4l/selection-api-005.rst
index 94731a13efdb..94731a13efdb 100644
--- a/Documentation/linux_tv/media/v4l/selection-api-005.rst
+++ b/Documentation/media/uapi/v4l/selection-api-005.rst
diff --git a/Documentation/linux_tv/media/v4l/selection-api-006.rst b/Documentation/media/uapi/v4l/selection-api-006.rst
index b2ac12f2e3d4..b2ac12f2e3d4 100644
--- a/Documentation/linux_tv/media/v4l/selection-api-006.rst
+++ b/Documentation/media/uapi/v4l/selection-api-006.rst
diff --git a/Documentation/linux_tv/media/v4l/selection-api.rst b/Documentation/media/uapi/v4l/selection-api.rst
index 81ea52d785b9..81ea52d785b9 100644
--- a/Documentation/linux_tv/media/v4l/selection-api.rst
+++ b/Documentation/media/uapi/v4l/selection-api.rst
diff --git a/Documentation/linux_tv/media/v4l/selections-common.rst b/Documentation/media/uapi/v4l/selections-common.rst
index 69dbce4e6e47..69dbce4e6e47 100644
--- a/Documentation/linux_tv/media/v4l/selections-common.rst
+++ b/Documentation/media/uapi/v4l/selections-common.rst
diff --git a/Documentation/linux_tv/media/v4l/standard.rst b/Documentation/media/uapi/v4l/standard.rst
index 538588eef317..538588eef317 100644
--- a/Documentation/linux_tv/media/v4l/standard.rst
+++ b/Documentation/media/uapi/v4l/standard.rst
diff --git a/Documentation/linux_tv/media/v4l/streaming-par.rst b/Documentation/media/uapi/v4l/streaming-par.rst
index b07b0f0b35d4..b07b0f0b35d4 100644
--- a/Documentation/linux_tv/media/v4l/streaming-par.rst
+++ b/Documentation/media/uapi/v4l/streaming-par.rst
diff --git a/Documentation/linux_tv/media/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
index 6dbb27b09c34..6dbb27b09c34 100644
--- a/Documentation/linux_tv/media/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
diff --git a/Documentation/linux_tv/media/v4l/subdev-formats_files/bayer.png b/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png
index 9b15fb22e817..9b15fb22e817 100644
--- a/Documentation/linux_tv/media/v4l/subdev-formats_files/bayer.png
+++ b/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png
diff --git a/Documentation/linux_tv/media/v4l/tuner.rst b/Documentation/media/uapi/v4l/tuner.rst
index 23d0e00aefdd..23d0e00aefdd 100644
--- a/Documentation/linux_tv/media/v4l/tuner.rst
+++ b/Documentation/media/uapi/v4l/tuner.rst
diff --git a/Documentation/linux_tv/media/v4l/user-func.rst b/Documentation/media/uapi/v4l/user-func.rst
index 3e0413b83a33..3e0413b83a33 100644
--- a/Documentation/linux_tv/media/v4l/user-func.rst
+++ b/Documentation/media/uapi/v4l/user-func.rst
diff --git a/Documentation/linux_tv/media/v4l/userp.rst b/Documentation/media/uapi/v4l/userp.rst
index 0ecf7a13a7af..0ecf7a13a7af 100644
--- a/Documentation/linux_tv/media/v4l/userp.rst
+++ b/Documentation/media/uapi/v4l/userp.rst
diff --git a/Documentation/linux_tv/media/v4l/v4l2-selection-flags.rst b/Documentation/media/uapi/v4l/v4l2-selection-flags.rst
index 3ce3731faf5f..3ce3731faf5f 100644
--- a/Documentation/linux_tv/media/v4l/v4l2-selection-flags.rst
+++ b/Documentation/media/uapi/v4l/v4l2-selection-flags.rst
diff --git a/Documentation/linux_tv/media/v4l/v4l2-selection-targets.rst b/Documentation/media/uapi/v4l/v4l2-selection-targets.rst
index 7519099a50cd..7519099a50cd 100644
--- a/Documentation/linux_tv/media/v4l/v4l2-selection-targets.rst
+++ b/Documentation/media/uapi/v4l/v4l2-selection-targets.rst
diff --git a/Documentation/linux_tv/media/v4l/v4l2.rst b/Documentation/media/uapi/v4l/v4l2.rst
index 301f95b5bdc6..301f95b5bdc6 100644
--- a/Documentation/linux_tv/media/v4l/v4l2.rst
+++ b/Documentation/media/uapi/v4l/v4l2.rst
diff --git a/Documentation/linux_tv/media/v4l/v4l2grab-example.rst b/Documentation/media/uapi/v4l/v4l2grab-example.rst
index c240f0513bee..c240f0513bee 100644
--- a/Documentation/linux_tv/media/v4l/v4l2grab-example.rst
+++ b/Documentation/media/uapi/v4l/v4l2grab-example.rst
diff --git a/Documentation/linux_tv/media/v4l/v4l2grab.c.rst b/Documentation/media/uapi/v4l/v4l2grab.c.rst
index 5aabd0b7b089..5aabd0b7b089 100644
--- a/Documentation/linux_tv/media/v4l/v4l2grab.c.rst
+++ b/Documentation/media/uapi/v4l/v4l2grab.c.rst
diff --git a/Documentation/linux_tv/media/v4l/video.rst b/Documentation/media/uapi/v4l/video.rst
index e38ebe192614..e38ebe192614 100644
--- a/Documentation/linux_tv/media/v4l/video.rst
+++ b/Documentation/media/uapi/v4l/video.rst
diff --git a/Documentation/linux_tv/media/v4l/videodev.rst b/Documentation/media/uapi/v4l/videodev.rst
index b9ee4672d639..b9ee4672d639 100644
--- a/Documentation/linux_tv/media/v4l/videodev.rst
+++ b/Documentation/media/uapi/v4l/videodev.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-create-bufs.rst b/Documentation/media/uapi/v4l/vidioc-create-bufs.rst
index abdc0b4d83d5..abdc0b4d83d5 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-create-bufs.rst
+++ b/Documentation/media/uapi/v4l/vidioc-create-bufs.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-cropcap.rst b/Documentation/media/uapi/v4l/vidioc-cropcap.rst
index 8dcbe6d26219..8dcbe6d26219 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-cropcap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-cropcap.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-dbg-g-chip-info.rst b/Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst
index efa911c0fb19..efa911c0fb19 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-dbg-g-chip-info.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-dbg-g-register.rst b/Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst
index 345aa321f380..345aa321f380 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-dbg-g-register.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-decoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
index 2a36e91b57b9..2a36e91b57b9 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-decoder-cmd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-dqevent.rst b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
index 73c0d5be62ee..73c0d5be62ee 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-dqevent.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-dv-timings-cap.rst b/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
index 5a35bb254b4b..5a35bb254b4b 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-dv-timings-cap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-encoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst
index 69bd9b4e0e56..69bd9b4e0e56 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-encoder-cmd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enum-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst
index f0dd0c4ca7d0..f0dd0c4ca7d0 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enum-dv-timings.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index 257c624e27be..257c624e27be 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enum-frameintervals.rst b/Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst
index 5d5de535a0fe..5d5de535a0fe 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enum-frameintervals.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enum-framesizes.rst b/Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst
index d3b2e97df6c9..d3b2e97df6c9 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enum-framesizes.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enum-freq-bands.rst b/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
index ea754f4f5532..ea754f4f5532 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enum-freq-bands.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enumaudio.rst b/Documentation/media/uapi/v4l/vidioc-enumaudio.rst
index bfdc3533240d..bfdc3533240d 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enumaudio.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enumaudio.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enumaudioout.rst b/Documentation/media/uapi/v4l/vidioc-enumaudioout.rst
index 15bc5a40f4a6..15bc5a40f4a6 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enumaudioout.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enumaudioout.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enuminput.rst b/Documentation/media/uapi/v4l/vidioc-enuminput.rst
index c1fc2e1f1d98..c1fc2e1f1d98 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enuminput.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enuminput.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enumoutput.rst b/Documentation/media/uapi/v4l/vidioc-enumoutput.rst
index 82fc9d3b237f..82fc9d3b237f 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enumoutput.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enumoutput.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-enumstd.rst b/Documentation/media/uapi/v4l/vidioc-enumstd.rst
index ce911c81bd3d..ce911c81bd3d 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-enumstd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enumstd.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-expbuf.rst b/Documentation/media/uapi/v4l/vidioc-expbuf.rst
index ded708e647fa..ded708e647fa 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-expbuf.rst
+++ b/Documentation/media/uapi/v4l/vidioc-expbuf.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-audio.rst b/Documentation/media/uapi/v4l/vidioc-g-audio.rst
index cccbcdb8c463..cccbcdb8c463 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-audio.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-audio.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-audioout.rst b/Documentation/media/uapi/v4l/vidioc-g-audioout.rst
index bee5f78ed7c1..bee5f78ed7c1 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-audioout.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-audioout.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-crop.rst b/Documentation/media/uapi/v4l/vidioc-g-crop.rst
index 6cf76497937c..6cf76497937c 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-crop.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-crop.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-ctrl.rst b/Documentation/media/uapi/v4l/vidioc-g-ctrl.rst
index ee929f692ebe..ee929f692ebe 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-ctrl.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-ctrl.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
index e19d64e0116a..e19d64e0116a 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-dv-timings.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-edid.rst b/Documentation/media/uapi/v4l/vidioc-g-edid.rst
index 907b2c1764a3..907b2c1764a3 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-edid.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-edid.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-enc-index.rst b/Documentation/media/uapi/v4l/vidioc-g-enc-index.rst
index f0f41ac56b80..f0f41ac56b80 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-enc-index.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-enc-index.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-ext-ctrls.rst b/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
index 96b6eaca755c..96b6eaca755c 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-ext-ctrls.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-fbuf.rst b/Documentation/media/uapi/v4l/vidioc-g-fbuf.rst
index ef4592c338ef..ef4592c338ef 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-fbuf.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-fbuf.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-fmt.rst b/Documentation/media/uapi/v4l/vidioc-g-fmt.rst
index ee6f11978fd6..ee6f11978fd6 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-fmt.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-frequency.rst b/Documentation/media/uapi/v4l/vidioc-g-frequency.rst
index a1fd2a870de4..a1fd2a870de4 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-frequency.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-frequency.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-input.rst b/Documentation/media/uapi/v4l/vidioc-g-input.rst
index 29e22f6f8028..29e22f6f8028 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-input.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-input.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-jpegcomp.rst b/Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst
index f5bf8b7915ed..f5bf8b7915ed 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-jpegcomp.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-modulator.rst b/Documentation/media/uapi/v4l/vidioc-g-modulator.rst
index 05d83610bdc5..05d83610bdc5 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-modulator.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-modulator.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-output.rst b/Documentation/media/uapi/v4l/vidioc-g-output.rst
index ae0ad577ba97..ae0ad577ba97 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-output.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-output.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-parm.rst b/Documentation/media/uapi/v4l/vidioc-g-parm.rst
index 7116e0decddc..7116e0decddc 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-parm.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-parm.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-priority.rst b/Documentation/media/uapi/v4l/vidioc-g-priority.rst
index 9f774ce400a4..9f774ce400a4 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-priority.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-priority.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-g-selection.rst
index 953931fabd00..953931fabd00 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-selection.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-selection.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-selection_files/constraints.png b/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png
index 20228d2c5504..20228d2c5504 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-selection_files/constraints.png
+++ b/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-sliced-vbi-cap.rst b/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
index 76dd4ba3254f..76dd4ba3254f 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-sliced-vbi-cap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-std.rst b/Documentation/media/uapi/v4l/vidioc-g-std.rst
index 5c2b861f8d26..5c2b861f8d26 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-std.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-std.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-g-tuner.rst b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
index a8d7ebd73e8a..a8d7ebd73e8a 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-g-tuner.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-log-status.rst b/Documentation/media/uapi/v4l/vidioc-log-status.rst
index 66fc352c0ffa..66fc352c0ffa 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-log-status.rst
+++ b/Documentation/media/uapi/v4l/vidioc-log-status.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-overlay.rst b/Documentation/media/uapi/v4l/vidioc-overlay.rst
index 191dbc144ef7..191dbc144ef7 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-overlay.rst
+++ b/Documentation/media/uapi/v4l/vidioc-overlay.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-prepare-buf.rst b/Documentation/media/uapi/v4l/vidioc-prepare-buf.rst
index 79076dff46fd..79076dff46fd 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-prepare-buf.rst
+++ b/Documentation/media/uapi/v4l/vidioc-prepare-buf.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-qbuf.rst b/Documentation/media/uapi/v4l/vidioc-qbuf.rst
index 9870d243131a..9870d243131a 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-qbuf.rst
+++ b/Documentation/media/uapi/v4l/vidioc-qbuf.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-query-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst
index 338b80df5b9b..338b80df5b9b 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-query-dv-timings.rst
+++ b/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-querybuf.rst b/Documentation/media/uapi/v4l/vidioc-querybuf.rst
index 32af6f7b5060..32af6f7b5060 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-querybuf.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querybuf.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-querycap.rst b/Documentation/media/uapi/v4l/vidioc-querycap.rst
index f0271f834ac1..f0271f834ac1 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-querycap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querycap.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
index 0f27e712eec9..0f27e712eec9 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-queryctrl.rst
+++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-querystd.rst b/Documentation/media/uapi/v4l/vidioc-querystd.rst
index 5bf62775c740..5bf62775c740 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-querystd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querystd.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
index c25b0719c2ff..c25b0719c2ff 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-reqbufs.rst
+++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-s-hw-freq-seek.rst b/Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst
index 5fd332a5bfee..5fd332a5bfee 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-s-hw-freq-seek.rst
+++ b/Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-streamon.rst b/Documentation/media/uapi/v4l/vidioc-streamon.rst
index e87500e608e1..e87500e608e1 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-streamon.rst
+++ b/Documentation/media/uapi/v4l/vidioc-streamon.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subdev-enum-frame-interval.rst b/Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst
index 0aa6482a91a6..0aa6482a91a6 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subdev-enum-frame-interval.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subdev-enum-frame-size.rst b/Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst
index 7a5811b71b68..7a5811b71b68 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subdev-enum-frame-size.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subdev-enum-mbus-code.rst b/Documentation/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst
index bc0531eb56fa..bc0531eb56fa 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subdev-enum-mbus-code.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-crop.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst
index 690034a391d3..690034a391d3 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-crop.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-fmt.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst
index 90e2a6635ebc..90e2a6635ebc 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-frame-interval.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst
index d8a1cabbd272..d8a1cabbd272 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-frame-interval.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst
index 50838a4a429e..50838a4a429e 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subdev-g-selection.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst
diff --git a/Documentation/linux_tv/media/v4l/vidioc-subscribe-event.rst b/Documentation/media/uapi/v4l/vidioc-subscribe-event.rst
index a027f602de3d..a027f602de3d 100644
--- a/Documentation/linux_tv/media/v4l/vidioc-subscribe-event.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subscribe-event.rst
diff --git a/Documentation/linux_tv/media/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst
index 3334ea445657..3334ea445657 100644
--- a/Documentation/linux_tv/media/v4l/yuv-formats.rst
+++ b/Documentation/media/uapi/v4l/yuv-formats.rst
diff --git a/Documentation/linux_tv/video.h.rst.exceptions b/Documentation/media/video.h.rst.exceptions
index 8866145e8269..8866145e8269 100644
--- a/Documentation/linux_tv/video.h.rst.exceptions
+++ b/Documentation/media/video.h.rst.exceptions
diff --git a/Documentation/linux_tv/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
index c15660f5c588..c15660f5c588 100644
--- a/Documentation/linux_tv/videodev2.h.rst.exceptions
+++ b/Documentation/media/videodev2.h.rst.exceptions