From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [GIT PULL] OMAP: SoC data/core: cleanups for 3.1 Date: Tue, 12 Jul 2011 23:49:50 -0700 Message-ID: <20110713064949.GI5783@atomide.com> References: <20110711083225.GO5783@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-03-ewr.mailhop.org ([204.13.248.66]:25964 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758127Ab1GMGtx (ORCPT ); Wed, 13 Jul 2011 02:49:53 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Paul Walmsley [110712 23:33]: > Hi Tony, > > On Mon, 11 Jul 2011, Tony Lindgren wrote: > > > Paul, please use the mainline tags or linux-omap static branches > > instead of the arm-soc branches. In this case there's only the extra > > merge commit there, so not a problem. Now it just makes it a bit > > harder for me to do pull requests and diffs to other branches. > > > > In general, we want to keep the dependencies between branches and > > other trees to minimum. > > Sorry about that. It was a misunderstanding on my part. No problem, we should probably document that in the wiki page.. > Would you like me to rebase the prcm-fixes-3.1 and prcm-devel-3.1 branches > on a different branch/commit? No need to, they're already all pulled in and in arm-soc waiting for the merge window. Regards, Tony