From: Thierry Reding <thierry.reding@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Laxman Dewangan <ldewangan@nvidia.com>
Subject: Re: linux-next: manual merge of the pwm tree with the regulator tree
Date: Tue, 3 May 2016 14:18:43 +0200 [thread overview]
Message-ID: <20160503121843.GA18517@ulmo.ba.sec> (raw)
In-Reply-To: <20160503110343.GM6292@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 873 bytes --]
On Tue, May 03, 2016 at 12:03:43PM +0100, Mark Brown wrote:
> 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.
I had to reshuffle things a little, but I've new sent out a pull request
for a stable branch that contains the one regulator patch on top of the
shared dependency branch that adds the new struct pwm_args.
Let me know if you need anything else.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-05-03 12:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-03 8:25 linux-next: manual merge of the pwm tree with the regulator tree Stephen Rothwell
2016-05-03 11:03 ` Mark Brown
2016-05-03 12:18 ` Thierry Reding [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-11 6:56 Stephen Rothwell
2016-07-11 16:47 ` Doug Anderson
2016-07-11 21:30 ` Thierry Reding
2016-07-11 21:39 ` Thierry Reding
2016-07-25 8:29 ` Thierry Reding
2016-07-25 13:29 ` Doug Anderson
2016-07-25 14:26 ` Thierry Reding
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160503121843.GA18517@ulmo.ba.sec \
--to=thierry.reding@gmail.com \
--cc=boris.brezillon@free-electrons.com \
--cc=broonie@kernel.org \
--cc=ldewangan@nvidia.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox