From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 2 Mar 2012 16:58:11 +0000 Subject: [PATCH 0/4] ARM: kirkwood: fdt: convert kirkwood init funcs to fdt In-Reply-To: <20120302163121.GI11986@titan.lakedaemon.net> References: <201203012214.07019.arnd@arndb.de> <20120302163121.GI11986@titan.lakedaemon.net> Message-ID: <201203021658.12047.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Friday 02 March 2012, Jason wrote: > > > > I have other commit IDs for the two patches that I took from your > > emails, so you should rebase the other patches on top of the > > version that I have in the arm-soc/kirkwood/board branch, otherwise > > we end up with duplicate commits my tree when I pull them again. > > Got it, I cherry-picked the series over and incorporated Grant's > suggestions. > Just making sure you know about this one: git rebase -i --onto arm-soc/kirkwood/board torvalds/master The '-i' lets you pick which ones you want to move over, then it applies all patches from the current branch that are not on torvalds/master on top of the last commit from arm-soc/kirkwood/board. If you don't know it yet, I suggest you play with this for an hour or so that will be very well invested time. If you knew this, then nevermind. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH 0/4] ARM: kirkwood: fdt: convert kirkwood init funcs to fdt Date: Fri, 2 Mar 2012 16:58:11 +0000 Message-ID: <201203021658.12047.arnd@arndb.de> References: <201203012214.07019.arnd@arndb.de> <20120302163121.GI11986@titan.lakedaemon.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120302163121.GI11986-u4khhh1J0LxI1Ri9qeTfzeTW4wlIGRCZ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, Jason List-Id: devicetree@vger.kernel.org On Friday 02 March 2012, Jason wrote: > > > > I have other commit IDs for the two patches that I took from your > > emails, so you should rebase the other patches on top of the > > version that I have in the arm-soc/kirkwood/board branch, otherwise > > we end up with duplicate commits my tree when I pull them again. > > Got it, I cherry-picked the series over and incorporated Grant's > suggestions. > Just making sure you know about this one: git rebase -i --onto arm-soc/kirkwood/board torvalds/master The '-i' lets you pick which ones you want to move over, then it applies all patches from the current branch that are not on torvalds/master on top of the last commit from arm-soc/kirkwood/board. If you don't know it yet, I suggest you play with this for an hour or so that will be very well invested time. If you knew this, then nevermind. Arnd