[GIT PULL 3/4] ARM: mvebu: boards for v3.9

Jason Cooper jason at lakedaemon.net
Tue Feb 5 06:21:04 EST 2013


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.

> 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"

thx,

Jason.



More information about the linux-arm-kernel mailing list