From d3e569ed7d4d6d73fce228c5a00d34f78d243c3b Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 23 Aug 2021 09:49:09 -0700 Subject: [PATCH] Revert "media: dvb header files: move some headers to staging" This reverts commit 070aac78abc62a0b204ad45fe54a54751a16fe1c. It turns out that some user-space applications use these uapi header files, so even though the only user of the interface is an old driver that was moved to staging, moving the header files causes unnecessary pain. Generally, we really don't want user space to use kernel headers directly (exactly because it causes pain when we re-organize), and instead copy them as needed. But these things happen, and the headers were in the uapi directory, so I guess it's not entirely unreasonable. Link: https://lore.kernel.org/lkml/4e3e0d40-df4a-94f8-7c2d-85010b0873c4@web.de/ Reported-by: Soeren Moch Cc: stable@kernel.org # 5.13 Cc: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds --- drivers/staging/media/av7110/av7110.h | 7 +++---- .../media/av7110 => include/uapi/linux/dvb}/audio.h | 0 .../staging/media/av7110 => include/uapi/linux/dvb}/osd.h | 0 .../media/av7110 => include/uapi/linux/dvb}/video.h | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename {drivers/staging/media/av7110 => include/uapi/linux/dvb}/audio.h (100%) rename {drivers/staging/media/av7110 => include/uapi/linux/dvb}/osd.h (100%) rename {drivers/staging/media/av7110 => include/uapi/linux/dvb}/video.h (100%) diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index b8e8fc8ddbe9c..809d938ae1667 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -9,12 +9,11 @@ #include #include -#include "video.h" -#include "audio.h" -#include "osd.h" - +#include +#include #include #include +#include #include #include diff --git a/drivers/staging/media/av7110/audio.h b/include/uapi/linux/dvb/audio.h similarity index 100% rename from drivers/staging/media/av7110/audio.h rename to include/uapi/linux/dvb/audio.h diff --git a/drivers/staging/media/av7110/osd.h b/include/uapi/linux/dvb/osd.h similarity index 100% rename from drivers/staging/media/av7110/osd.h rename to include/uapi/linux/dvb/osd.h diff --git a/drivers/staging/media/av7110/video.h b/include/uapi/linux/dvb/video.h similarity index 100% rename from drivers/staging/media/av7110/video.h rename to include/uapi/linux/dvb/video.h -- 2.39.5