linux-kernel - linux-next: manual merge of the arm-soc tree with the pinctrl 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: <20130131003647.daebd2aed733d0304c2c7aa0@canb.auug.org.au>
Date:	Thu, 31 Jan 2013 00:36:47 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus Walleij <linus.walleij@...aro.org>,
	Gabriel Fernandez <gabriel.fernandez@...ricsson.com>
Subject: linux-next: manual merge of the arm-soc tree with the pinctrl tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/pinctrl/pinctrl-nomadik.c between commit e32af8894588
("pinctrl/nomadik: add device tree support") from the pinctrl tree and
commit 6010d40320f8 ("ARM: nomadik: move GPIO and pinctrl to device
tree") from the arm-soc 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 drivers/pinctrl/pinctrl-nomadik.c
index 39c1651,ef21a66..0000000
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -2104,7 -1846,11 +2104,11 @@@ static struct pinctrl_desc nmk_pinctrl_
  
  static const struct of_device_id nmk_pinctrl_match[] = {
  	{
+ 		.compatible = "stericsson,nmk-pinctrl-stn8815",
+ 		.data = (void *)PINCTRL_NMK_STN8815,
+ 	},
+ 	{
 -		.compatible = "stericsson,nmk_pinctrl",
 +		.compatible = "stericsson,nmk-pinctrl",
  		.data = (void *)PINCTRL_NMK_DB8500,
  	},
  	{},

Content of type "application/pgp-signature" skipped