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

[Linus Walleij]

On Wed, Jun 26, 2013 at 8:06 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi Linus,
>
> Today's linux-next merge of the pinctrl tree got a conflict in
> drivers/pinctrl/Makefile between commit 701016c0cba5 ("pinctrl: st: Add
> pinctrl and pinconf support") from the regmap tree and commit
> 78bafc66180d ("pinctrl: add VF610 pinctrl driver") from the pinctrl tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Aha yes Mark is carrying that driver in the regmap tree so should
be expected. Solution is correct, thanks.

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/