From: Daniel Vetter <daniel@ffwll.ch>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Linus Walleij <linus.walleij@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Lee Jones <lee.jones@linaro.org>,
intel-gfx <intel-gfx@lists.freedesktop.org>
Subject: Re: [PULL] topic/crc-pmic
Date: Mon, 27 Jul 2015 15:09:54 +0200 [thread overview]
Message-ID: <20150727130954.GV16722@phenom.ffwll.local> (raw)
In-Reply-To: <20150727112100.GA24957@ulmo>
On Mon, Jul 27, 2015 at 01:21:01PM +0200, Thierry Reding wrote:
> On Thu, Jul 23, 2015 at 09:38:46AM +0200, Daniel Vetter wrote:
> [...]
> > On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> [...]
> > > Shobhit Kumar (8):
> [...]
> > > pwm: crc: Add Crystalcove (CRC) PWM driver
>
> Would you mind removing this from your branch? I ended up manually
> applying a couple of changes that I had requested but ended up not
> getting addressed.
>
> When you drop it, let me know so I can push my branch to -next and
> have it not collide with your tree immediately. I assume it's in a
> branch that feeds into linux-next?
Oops sorry I missed that there was still review pending. Unfortuntely Dave
already pulled this into drm-next so it's baked in. I guess best would be
to pull this into your pwm branch too and resolve the conflicts in the
merge explicitly. Sorry about the mess I've caused here for you.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-07-27 13:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150723073143.GA23326@phenom.ffwll.local>
2015-07-23 7:38 ` [PULL] topic/crc-pmic Daniel Vetter
2015-07-27 11:21 ` Thierry Reding
2015-07-27 13:09 ` Daniel Vetter [this message]
2015-07-27 13:20 ` Thierry Reding
2015-07-28 3:35 ` Kumar, Shobhit
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=20150727130954.GV16722@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gnurou@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=thierry.reding@gmail.com \
/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