From: Zhang Rui <rui.zhang@intel.com>
To: Eduardo Valentin <edubezval@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Linux PM list <linux-pm@vger.kernel.org>
Subject: Re: [GIT PULL] Thermal management updates for v4.1-rc2
Date: Fri, 01 May 2015 09:36:35 +0800 [thread overview]
Message-ID: <1430444195.29011.8.camel@rzhang1-mobl4> (raw)
In-Reply-To: <20150429015837.GA4517@localhost.localdomain>
Hi, Eduardo,
On Tue, 2015-04-28 at 18:58 -0700, Eduardo Valentin wrote:
> Linus, Rui,
>
> On Tue, Apr 28, 2015 at 02:40:02AM +0000, Zhang, Rui wrote:
> > Hi, Linus,
> >
> > Sorry that I missed the merged window as my email was broken while I was travelling in Portland last week. And I need to get it fixed after I came back this Sunday.
> > Thus I was hoping that this can still get merged as it is early -rc2.
> > Sorry for bringing the trouble to you and the patch contributors, I will send another git pull request.
> >
> > Thanks,
> > rui
> >
> > > -----Original Message-----
> > > From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> > > owner@vger.kernel.org] On Behalf Of Linus Torvalds
> > > Sent: Tuesday, April 28, 2015 5:05 AM
> > > To: Zhang, Rui
> > > Cc: Linux PM list
> > > Subject: Re: [GIT PULL] Thermal management updates for v4.1-rc2
> > > Importance: High
> > >
> > > On Mon, Apr 27, 2015 at 4:58 AM, Zhang Rui <rui.zhang@intel.com> wrote:
> > > >
> > > > to receive the Thermal Management updates for v4.1-rc2 with top-most
> > > > commit
> > >
> > > This came outside the merge window (why?), so I'm ignoring it.
> > >
> > > If you have bug-fixes, send those. The rest can wait until 4.2.
> > >
>
> Linus,
>
> We have content that has been waiting for 4.1 merge window for some
> time. It was sent into linux-next several weeks ago [1]. My 4.1 pull
> to Rui was a couple of weeks ago [2].
>
> It is disappointing for the developers who has been waiting for final
> merge of their code that in the end it didn't make it due to corporate
> email issues.
>
> I know it is your call to pull it or not for 4.1. I just want to explain
> that the thermal-soc content is not a last minute change.
Again, I'm sorry that I missed this merge window.
It's disappointing but I think we should move forward.
can you please send me two git pull requests, one for 4.1-rc and another
for 4.2?
> Rui,
>
> Whenever you have such issues, let me know and we can do something to
> avoid content missing the merge window. I can of course, send pulls with
> accepted content, just the way I have been sending.
>
Sure will do next time. It is my mistake that I thought I was able to
catch the merge window.
thanks,
rui
>
> BR,
>
> Eduardo Valentin
>
> [1] - https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=899e56ad58f544e115070a7b4bd7b2dafc646936
> [2] - http://marc.info/?l=linux-pm&m=142907689627135&w=2
>
>
> > > Linus
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-pm" in the
> > > body of a message to majordomo@vger.kernel.org More majordomo info at
> > > http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2015-05-01 1:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-27 11:58 [GIT PULL] Thermal management updates for v4.1-rc2 Zhang Rui
2015-04-27 21:04 ` Linus Torvalds
2015-04-28 2:40 ` Zhang, Rui
2015-04-29 1:58 ` Eduardo Valentin
2015-05-01 1:36 ` Zhang Rui [this message]
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=1430444195.29011.8.camel@rzhang1-mobl4 \
--to=rui.zhang@intel.com \
--cc=edubezval@gmail.com \
--cc=linux-pm@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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