From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Subject: Re: [GIT PULL] ARM: tegra: for-3.5/ahb branch Date: Mon, 14 May 2012 15:03:34 -0600 Message-ID: <4FB17326.5070908@wwwdotorg.org> References: <1337024794-25269-1-git-send-email-swarren@wwwdotorg.org> <201205142055.12881.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <201205142055.12881.arnd-r2nGTMty4D4@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Arnd Bergmann Cc: arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org On 05/14/2012 02:55 PM, Arnd Bergmann wrote: > On Monday 14 May 2012, Stephen Warren wrote: >> I meant to send this with the other two pull requests this morning, but >> forgot:-( >> >> This is the last pull request I intend to send for 3.5, except for any >> bugs that crop up. >> >> ---------------------------------------------------------------- >> >> The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015: >> >> Linux 3.4-rc3 >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/ahb >> >> for you to fetch changes up to 89c788bab1f0374ae05aef7560066442ceb55384: >> >> ARM: tegra: Add SMMU enabler in AHB >> > > When I pull the branch, I get an extraneous commit > "ARM: dt: tegra: Add device tree support for AHB" that adds nodes that are > already there from another branch. I've removed that commit and applied the > rest to next/drivers. Please check what I have now. Sorry about that. That the correct "resolution"; I simply forgot to re-push the ahb branch after I moved that commit into the dt branch.