From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhang Rui Subject: Re: [GIT PULL] Thermal management updates for v4.1-rc2 Date: Fri, 01 May 2015 09:36:35 +0800 Message-ID: <1430444195.29011.8.camel@rzhang1-mobl4> References: <1430135910.3335.14.camel@rzhang1-mobl4> <744357E9AAD1214791ACBA4B0B909263014F3F2D@SHSMSX101.ccr.corp.intel.com> <20150429015837.GA4517@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com ([134.134.136.65]:59667 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbbEABgh (ORCPT ); Thu, 30 Apr 2015 21:36:37 -0400 In-Reply-To: <20150429015837.GA4517@localhost.localdomain> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: Eduardo Valentin Cc: Linus Torvalds , Linux PM list 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 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