On Mon, 2014-11-10 at 11:20 +0900, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> The patch below does not apply to the 3.17-stable tree.
That is caused by v3.18-rc1 commit 7155043c2d02 ("[media] enable
COMPILE_TEST for media drivers"). That added "|| COMPILE_TEST" to the
lines this commit is touching.
It ought to be easy to backport the patch we're discussing here to
v3.17. It only requires trivial changes (ie, drop "|| COMPILE_TEST" from
the lines it touches). But do the stable rules allow that?
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 098bcd2335f0824e76dd835e4e2b7ae8e38fc281 Mon Sep 17 00:00:00 2001
> From: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
> Date: Mon, 6 Oct 2014 13:08:06 -0300
> Subject: [PATCH] [media] Remove references to non-existent PLAT_S5P symbol
>
> The PLAT_S5P Kconfig symbol was removed in commit d78c16ccde96
> ("ARM: SAMSUNG: Remove remaining legacy code"). However, there
> are still some references to that symbol left, fix that by
> substituting them with ARCH_S5PV210.
>
> Fixes: d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code")
>
> Reported-by: Paul Bolle <pebolle@xxxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # for 3.17
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index bee9074ebc13..3aac88f1d54a 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -166,7 +166,7 @@ config VIDEO_MEM2MEM_DEINTERLACE
> config VIDEO_SAMSUNG_S5P_G2D
> tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
> depends on VIDEO_DEV && VIDEO_V4L2
> - depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
> + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> depends on HAS_DMA
> select VIDEOBUF2_DMA_CONTIG
> select V4L2_MEM2MEM_DEV
> @@ -178,7 +178,7 @@ config VIDEO_SAMSUNG_S5P_G2D
> config VIDEO_SAMSUNG_S5P_JPEG
> tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
> depends on VIDEO_DEV && VIDEO_V4L2
> - depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
> + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> depends on HAS_DMA
> select VIDEOBUF2_DMA_CONTIG
> select V4L2_MEM2MEM_DEV
> @@ -189,7 +189,7 @@ config VIDEO_SAMSUNG_S5P_JPEG
> config VIDEO_SAMSUNG_S5P_MFC
> tristate "Samsung S5P MFC Video Codec"
> depends on VIDEO_DEV && VIDEO_V4L2
> - depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
> + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> depends on HAS_DMA
> select VIDEOBUF2_DMA_CONTIG
> default n
> diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
> index 77c951237744..b7b2e472240a 100644
> --- a/drivers/media/platform/exynos4-is/Kconfig
> +++ b/drivers/media/platform/exynos4-is/Kconfig
> @@ -2,7 +2,7 @@
> config VIDEO_SAMSUNG_EXYNOS4_IS
> bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
> depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
> - depends on (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST)
> + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> depends on OF && COMMON_CLK
> help
> Say Y here to enable camera host interface devices for
> diff --git a/drivers/media/platform/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig
> index a9d56f8936b4..beb180e71ba0 100644
> --- a/drivers/media/platform/s5p-tv/Kconfig
> +++ b/drivers/media/platform/s5p-tv/Kconfig
> @@ -9,7 +9,7 @@
> config VIDEO_SAMSUNG_S5P_TV
> bool "Samsung TV driver for S5P platform"
> depends on PM_RUNTIME
> - depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
> + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> default n
> ---help---
> Say Y here to enable selecting the TV output devices for
>
Paul Bolle
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html