Re: linux-next: manual merge of the pwm tree with the regulator tree

From: Mark Brown
Date: Tue May 03 2016 - 07:03:55 EST

On Tue, May 03, 2016 at 06:25:09PM +1000, Stephen Rothwell wrote:

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Please send me a pull request for the regulator commits you've added.

Attachment: signature.asc
Description: PGP signature