On Tue, Jun 11, 2013 at 12:45 AM, Olof Johansson <olof@xxxxxxxxx> wrote: > On Mon, Jun 10, 2013 at 06:13:10PM +0200, Linus Walleij wrote: >> On Mon, Jun 10, 2013 at 4:45 PM, Tomasz Figa <t.figa@xxxxxxxxxxx> wrote: >> > On Friday 17 of May 2013 18:24:29 Tomasz Figa wrote: >> >> This patch makes legacy code on suspend/resume path being executed >> >> conditionally, on non-DT platforms only, to fix suspend/resume of >> >> DT-enabled systems, for which the code is inappropriate. >> >> >> >> Signed-off-by: Tomasz Figa <t.figa@xxxxxxxxxxx> >> >> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> >> >> --- >> >> arch/arm/plat-samsung/pm.c | 17 ++++++++++++----- >> >> 1 file changed, 12 insertions(+), 5 deletions(-) >> > >> > It seems like this patch did not make it into 3.10-rc5, while rest of patches >> > did, which ended up with suspend/resume still being broken. >> > >> > What should we do in this case? >> >> I did not apply this patch to the pinctrl tree because it begins >> with ARM: but it appears I promised to carry it anyway... >> >> I need an ACK from the ARM SoC people to do that though, >> or you can take it through ARM SoC fixes directly. >> >> I would just ask Olof/Arnd to apply it directly as a separate >> patch. > > It makes sense to take this through arm-soc since it's no longer > dependent on anything else. > > Applied to fixes. Please do follow through with the promised cleanups at some > point, Tomasz. :-) Btw, I had to add an include of <linux/of.h> or else all non-DT builds broke... -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html