From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Date: Wed, 14 Mar 2012 00:16:40 +0000 Subject: Re: [GIT PULL] Renesas SoC updates for v3.4, take 2 Message-Id: <201203140116.40344.rjw@sisk.pl> List-Id: References: <201203092155.04731.rjw@sisk.pl> <201203132242.07283.rjw@sisk.pl> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Olof Johansson Cc: Arnd Bergmann , LKML , Magnus Damm , Linux-sh list , "arm@kernel.org" , Paul Mundt On Wednesday, March 14, 2012, Olof Johansson wrote: > On Tue, Mar 13, 2012 at 2:42 PM, Rafael J. Wysocki wrote: > > On Tuesday, March 13, 2012, Rafael J. Wysocki wrote: > >> On Tuesday, March 13, 2012, Arnd Bergmann wrote: > >> > On Tuesday 13 March 2012, Rafael J. Wysocki wrote: > >> > > > Note that the __io() issue has turned out to be more urgent than I first > >> > > > thought when we discussed it, so it would be good to apply the patch below > >> > > > on top of your series. > >> > > > >> > > Do you want me to apply it now or will you do that in your tree? > >> > > >> > Doesn't matter to me, as long as one of you applies it ;-) > >> > >> OK, so I will add it to the soc branch in the Renesas tree. > > > > Applied and pushed back the updated tree. > > Seems like you applied the patch but without the subject line, I didn't notice that, sorry. > so now git thinks the whole first paragraph is the patch subject. That's a > bit messy and I'd prefer if you could fix it up. I've just replaced the broken commit with a new fixed one. > Do you have downstream users of your tree that you'll mess up if you > rebase the last commit though? Alternatively I can take everything on > the branch but the last patch and apply it myself, but that will still > cause trouble for your downstream developers once things go upstream > and come down. Hopefully, no one has pulled from the tree yet. :-) Thanks, Rafael From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756458Ab2CNAMb (ORCPT ); Tue, 13 Mar 2012 20:12:31 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:43533 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753754Ab2CNAM3 (ORCPT ); Tue, 13 Mar 2012 20:12:29 -0400 From: "Rafael J. Wysocki" To: Olof Johansson Subject: Re: [GIT PULL] Renesas SoC updates for v3.4, take 2 Date: Wed, 14 Mar 2012 01:16:40 +0100 User-Agent: KMail/1.13.6 (Linux/3.3.0-rc7+; KDE/4.6.0; x86_64; ; ) Cc: Arnd Bergmann , LKML , Magnus Damm , "Linux-sh list" , "arm@kernel.org" , Paul Mundt References: <201203092155.04731.rjw@sisk.pl> <201203132242.07283.rjw@sisk.pl> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201203140116.40344.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, March 14, 2012, Olof Johansson wrote: > On Tue, Mar 13, 2012 at 2:42 PM, Rafael J. Wysocki wrote: > > On Tuesday, March 13, 2012, Rafael J. Wysocki wrote: > >> On Tuesday, March 13, 2012, Arnd Bergmann wrote: > >> > On Tuesday 13 March 2012, Rafael J. Wysocki wrote: > >> > > > Note that the __io() issue has turned out to be more urgent than I first > >> > > > thought when we discussed it, so it would be good to apply the patch below > >> > > > on top of your series. > >> > > > >> > > Do you want me to apply it now or will you do that in your tree? > >> > > >> > Doesn't matter to me, as long as one of you applies it ;-) > >> > >> OK, so I will add it to the soc branch in the Renesas tree. > > > > Applied and pushed back the updated tree. > > Seems like you applied the patch but without the subject line, I didn't notice that, sorry. > so now git thinks the whole first paragraph is the patch subject. That's a > bit messy and I'd prefer if you could fix it up. I've just replaced the broken commit with a new fixed one. > Do you have downstream users of your tree that you'll mess up if you > rebase the last commit though? Alternatively I can take everything on > the branch but the last patch and apply it myself, but that will still > cause trouble for your downstream developers once things go upstream > and come down. Hopefully, no one has pulled from the tree yet. :-) Thanks, Rafael