Hi Linus, On 14.03.2017 14:35, Linus Walleij wrote: > On Thu, Feb 23, 2017 at 11:12 AM, Andrzej Hajda <a.hajda@xxxxxxxxxxx> wrote: > >> Some pinctrls share memory regions, and devm_ioremap_resource does not >> allow to share resources, in opposition to devm_ioremap. >> This patch restores back usage of devm_ioremap function, but with proper >> error handling and logging. >> >> Fixes: baafaca ("pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data()") >> Signed-off-by: Andrzej Hajda <a.hajda@xxxxxxxxxxx> >> --- >> v2: >> - added platform_get_resource error check (thanks to Krzysztof) > This conflicts with the revert that Marek urged me to do for the > fixes branch. > > Please check the resulting tree on my fixes branch and rebase on > that. I do not see your revert on fixes branch of [1]. The most recent patch is: 96e1ce8 pinctrl: uniphier: change pin names of aio/xirq for LD11 And on this branch my patch applies cleanly :) Regards Andrzej [1]: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git > > Yours, > Linus Walleij > > > -- 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