From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH 0/7] omap3: serial code for 3630 and zoom2/3 fixes Date: Mon, 15 Mar 2010 14:15:25 -0700 Message-ID: <20100315211525.GF2900@atomide.com> References: <1268424009-18974-1-git-send-email-saaguirre@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:53706 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932738Ab0COVOD (ORCPT ); Mon, 15 Mar 2010 17:14:03 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Aguirre, Sergio" Cc: "linux-omap@vger.kernel.org" , Kevin Hilman , "Pandita, Vikram" , Paul Walmsley , Felipe Balbi * Aguirre, Sergio [100315 13:33]: > Tony, > > Please find attached pull request for your convenience. > The following changes since commit a842b5f9ce70e1b738eabb4d719860070180ed1c: > Tony Lindgren (1): > Revert "omap: Add DSI regulator supply to OMAP3EVM board file" > > are available in the git repository at: > > git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera.git omap-fixes Please base all the branches against the recent tag in Linus' tree, in this case against v2.6.34-rc1. What we have in the linux-omap master branch is a merge of various development branches, and we don't want to merge that history to the mainline tree. If the recent mainline tag won't work as the base, then please rebase it on omap-fixes-for-linus or omap-for-linus. In this case, omap-fixes-for-linus at commit 29b2ee5af5f3a02846bd38a1e2121d62ee5f6aca. The omap-for-linus branch will contain things going into the next merge window, currently it's empty. In general, the commits ins omap-fixes-for-linus and omap-for-linus should stay around unless something goes wrong. But please use the recent mainline tag where possible, that's the most flexible option for merging. Regards, Tony