From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Lezcano Subject: Re: linux-next : cpuidle - could you add my tree please Date: Thu, 05 Jul 2012 15:33:16 +0200 Message-ID: <4FF5979C.6030802@linaro.org> References: <4FDEE98D.7010802@linaro.org> <20120703231948.33cca18e3cc3d6e497ab022d@canb.auug.org.au> <4FF2F2D3.4090200@linaro.org> <201207031854.51163.rjw@sisk.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <201207031854.51163.rjw@sisk.pl> Sender: linux-next-owner@vger.kernel.org To: "Rafael J. Wysocki" Cc: Stephen Rothwell , Linus Walleij , linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org, Lists Linaro-dev , Linux Kernel Mailing List , Kevin Hilman , Peter De Schrijver , Amit Kucheria , linux-next@vger.kernel.org, Colin Cross , Andrew Morton , Linus Torvalds , Rob Lee , "lenb@kernel.org" List-Id: linux-acpi@vger.kernel.org On 07/03/2012 06:54 PM, Rafael J. Wysocki wrote: > On Tuesday, July 03, 2012, Daniel Lezcano wrote: >> On 07/03/2012 03:19 PM, Stephen Rothwell wrote: >>> Hi Daniel, >>> >>> On Tue, 03 Jul 2012 14:56:58 +0200 Daniel Lezcano wrote: >>>> >>>>> So do you have a branch in the cpuidle-next.git tree that isn't g= oing to >>>>> be rebased? >>>> >>>> No. I am following Linus tree and adding the patches on top of it. >>> >>> Please don't rebase your tree more than necessary - it just makes t= hing >>> hard for anyone using your tree as a base for further development a= nd >>> throws away any testing you may have done. >> >> Ok, let me sync with Len and Rafael about the best way to do that. >=20 > Please create a branch in your tree for me to pull from and let me kn= ow > which one it is. Please note that this branch must not be rebased af= ter I've > pulled from it and it's going to be included into my linux-next branc= h > automatically. Ok that sounds good. Let me put in place the branch and rework my patches because they conflict with the 'disable' flag moved to the per cpu structure. In the meantime, I will send you the other patches which do not conflic= t. > I'll include it into my v3.6 push, because I have a couple of cpuidle= patches > queued up already. We'll need to discuss the future of it after 3.6,= though. Ok, cool. Thanks -- Daniel --=20 Linaro.org =E2=94=82 Open source software for= ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog