From mboxrd@z Thu Jan  1 00:00:00 1970
From: olof@lixom.net (Olof Johansson)
Date: Tue, 5 Feb 2013 10:23:33 -0800
Subject: [GIT PULL  3/4] ARM: mvebu: boards for v3.9
In-Reply-To: <20130205112104.GP14746@titan.lakedaemon.net>
References: <pull-1359733919-342140> <1359733919.c3D01c3.22262@triton>
 <20130205071010.GD13049@quad.lixom.net>
 <20130205112104.GP14746@titan.lakedaemon.net>
Message-ID: <20130205182333.GA21051@quad.lixom.net>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Tue, Feb 05, 2013 at 06:21:04AM -0500, Jason Cooper wrote:
> On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> > Hi,
> > 
> > On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > > 
> > >   Linux 3.8-rc5
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > > 
> > > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > > 
> > >   ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > > 
> > > ----------------------------------------------------------------
> > > mvebu boards for v3.9
> > >      - Guruplug Server Plus DT board
> > >      - RD-A370-A1 board
> > >      - mvebu improved SMP support in interrupt controller
> > >      - update defconfigs
> > >      - split legacy and DT setup for dove
> > >      - remove some redundant clock aliases
> > >     
> > >     depends on:
> > >      - tags/mvebu_fixes_for_v3.8-rc6
> > >      - tags/cleanup_for_v3.9_round2
> > >      - tags/drivers_for_v3.9
> > >      - mmc/mmc-next up to:
> > >         d293875 mmc: mvsdio: add pinctrl integration
> > 
> > Hm. What do you need the mmc branch for? Is it just the removal of the
> > redundant SDIO clock alias?
> 
> No, it's the four patches of Thomas' to the mvsdio driver:
> 
> d293875 mmc: mvsdio: add pinctrl integration
> 182ce21 mmc: mvsdio: implement a Device Tree binding
> aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
> 9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
> 
> which mvebu/boards needs before we can activate defconfig options.

Yeah, those are the patches you need to bring in. What I was wondering is why
you need to bring them in? If it's just for defconfig updates and a couple of
tiny cleanups, then I would say it's not worth the overhead of adding the
dependency branch to do those -- defconfig updates can go in anyway and the
cleanups can happen in the next release.

> > Also, it's really hard to tell where code came from when you just merge in
> > a hash like below:
> > 
> > > Jason Cooper (4):
> > >       Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> > >       Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> > >       Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> > >       Merge commit 'd293875' into mvebu/boards
> > 
> > That's the mmc-next branch at that commit, but it'd be nice to have a
> > more descriptive summary in the shortlog.
> 
> Agreed, I started doing this after the first time I pulled in pinctrl as
> a dependency.  LinusW recommended pulling just up to the commit needed
> so that if he did have to do a rebase, the closer it was to the tip of
> his tree, the fewer people it would affect.
> 
> Would this be better?
> 
> "Merge mmc/mmc-next up to 'd293875' into mvebu/boards"

Yeah, that would have been better (but see above).


-Olof