Re: linux-next: manual merge of the arm-soc tree with the pinctrl tree

[Linus Walleij]

On Fri, Dec 21, 2012 at 4:38 AM, Kukjin Kim <kgene.kim@xxxxxxxxxxx> wrote:
> Stephen Rothwell wrote:
>>
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got conflicts in
>> drivers/pinctrl/pinctrl-exynos5440.c and
>> drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl:
>> exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c") from the
>> pinctrl tree and commit d5fd5da290ce ("pinctrl: exynos5440/samsung:
>> Staticize pcfgs") from the arm-soc tree.
>>
> Oops, the commit d5fd5da290ce already sent to Linus Torvalds via arm-soc
> tree today. In addition, I applied with Linus Walleij's ack ;-)
>
> Linus Walleij, please drop the patch in your tree. Sorry I didn't notify
> about that when I got the patch from Choi.

OK dropped it, sorry for the delay...

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/