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
| ||
|
Message-ID: <20130112223050.GI13433@titan.lakedaemon.net> Date: Sat, 12 Jan 2013 17:30:50 -0500 From: Jason Cooper <jason@...edaemon.net> To: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com> Cc: Andrew Lunn <andrew@...n.ch>, Russell King <linux@....linux.org.uk>, linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org Subject: Re: [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node On Sat, Jan 12, 2013 at 10:51:35PM +0100, Sebastian Hesselbarth wrote: > On 01/12/2013 10:42 PM, Jason Cooper wrote: > >On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote: > >>gpio-leds has support for pinctrl allocation, make use of it. > >> > >>Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@...il.com> > >> ... > >> &pinctrl { > >>- pinctrl-0 =<&pmx_gpio_12&pmx_gpio_18>; > >>+ pinctrl-0 =<&pmx_gpio_12>; > >> pinctrl-names = "default"; > >> > >> pmx_gpio_12: pmx-gpio-12 { > >>-- > >>1.7.10.4 > > > >I'm getting a merge conflict wit hthe above: > > > >&pinctrl { > ><<<<<<< HEAD > > pinctrl-0 =<&pmx_gpio_18>; > >======= > > pinctrl-0 =<&pmx_gpio_12>; > >>>>>>>>ARM: Dove: move CuBox led pinctrl to gpio-leds node > > pinctrl-names = "default"; > > > > pmx_gpio_18: pmx-gpio-18 { > > marvell,pins = "mpp18"; > > marvell,function = "gpio"; > > }; > >}; > > > >Am I missing something? > > Jason, > > it depends on "ARM: Dove: move CuBox led pinctrl to gpio-leds node" > that you applied to mvebu/fixes two days ago. Ahhh, ok, I'll include it in this pull. thx, Jason. -- 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/
Powered by blists - more mailing lists