linux-kernel - linux-next: manual merge of the samsung tree with the arm-soc tree

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>] [day] [month] [year] [list]

Message-Id: <20130131014827.09251ece97f74377abada4ac@canb.auug.org.au>
Date:	Thu, 31 Jan 2013 01:48:27 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Abraham <thomas.abraham@...aro.org>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/common.c between commit b533c8685b16 ("ARM: dts: fix
compatible value for exynos pinctrl") from the arm-soc tree and commit
d28a60d89c83 ("ARM: EXYNOS: skip wakeup interrupt registration for
exynos5250 if pinctrl is enabled") from the samsung tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-exynos/common.c
index 68c0689,cdaa55f..0000000
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -1035,8 -1112,9 +1116,9 @@@ static int __init exynos_init_irq_eint(
  	 * interrupt support code here can be completely removed.
  	 */
  	static const struct of_device_id exynos_pinctrl_ids[] = {
 -		{ .compatible = "samsung,pinctrl-exynos4210", },
 -		{ .compatible = "samsung,pinctrl-exynos4x12", },
 -		{ .compatible = "samsung,pinctrl-exynos5250", },
 +		{ .compatible = "samsung,exynos4210-pinctrl", },
 +		{ .compatible = "samsung,exynos4x12-pinctrl", },
++		{ .compatible = "samsung,exynos5250-pinctrl", },
  	};
  	struct device_node *pctrl_np, *wkup_np;
  	const char *wkup_compat = "samsung,exynos4210-wakeup-eint";

Content of type "application/pgp-signature" skipped