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

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CACRpkdYrxdNqLtWvLd09nZD8+-FYCB2EY8tcgTawUSVrUn1HPQ@mail.gmail.com>
Date:	Wed, 26 Jun 2013 21:59:02 +0200
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Srinivas KANDAGATLA <srinivas.kandagatla@...com>,
	Mark Brown <broonie@...nel.org>,
	Jingchang Lu <b35083@...escale.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the regmap tree

On Wed, Jun 26, 2013 at 8:06 AM, Stephen Rothwell <sfr@...b.auug.org.au> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/