linux-kernel - Re: [PATCH] ARM: dts: fix bad merge of display timing node to exynos5250-smdk5250.dts

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <51630B26.1000102@samsung.com>
Date:	Tue, 09 Apr 2013 03:23:34 +0900
From:	Kukjin Kim <kgene.kim@...sung.com>
To:	Doug Anderson <dianders@...omium.org>
CC:	Kukjin Kim <kgene.kim@...sung.com>,
	linux-samsung-soc@...r.kernel.org,
	Russell King <linux@....linux.org.uk>,
	Leela Krishna Amudala <l.krishna@...sung.com>,
	Jingoo Han <jg1.han@...sung.com>, linux-kernel@...r.kernel.org,
	Thomas Abraham <thomas.abraham@...aro.org>,
	Olof Johansson <olof@...om.net>,
	linux-arm-kernel@...ts.infradead.org,
	Rahul Sharma <rahul.sharma@...sung.com>
Subject: Re: [PATCH] ARM: dts: fix bad merge of display timing node to exynos5250-smdk5250.dts

On 04/09/13 01:51, Doug Anderson wrote:
> The display timing node was added:
>    7ed2077 ARM: dts: Add display timing node to exynos5250-smdk5250.dts
> ...and looks OK there.  ...but it looks like we lost a "};" in the
> merge and it no longer compiles.  Fix it.
>
> Signed-off-by: Doug Anderson<dianders@...omium.org>
> ---
>   arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index 4be14df..26d856b 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -239,6 +239,7 @@
>   			vback-porch =<4>;
>   			vfront-porch =<4>;
>   			vsync-len =<4>;
> +		};
>   	};
>
>   	fixed-rate-clocks {

Thanks for your pointing out. But it should be fixed with re-sorting out 
the branch.

If any problems, please let me know.

- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/