Patchwork [GIT,PULL] dove late fixes for v3.7

login
register
mail settings
Submitter Jason
Date Sept. 25, 2012, 2:07 a.m.
Message ID <20120925020716.GY5469@titan.lakedaemon.net>
Download mbox
Permalink /patch/186672/
State New
Headers show

Pull-request

git://git.infradead.org/users/jcooper/linux.git dove/late-fixes

Comments

Jason - Sept. 25, 2012, 2:07 a.m.
Depends:
 - Based against arm-soc/for-next
 - Latest changes to arch/arm/mm/cache-tauros2.c
    c2b7e05 ARM: cache: add dt support for tauros2 cache

Misc. fixes for latest changes to mach-dove/
Fixes build breakage for mach-dove

The following changes since commit 24c7d887e4efb9d6ea26e416528efb3f1b203aae:

  Merge branch 'next/dt' into for-next (2012-09-23 21:52:54 -0700)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git dove/late-fixes

Sebastian Hesselbarth (6):
      ARM: dove: Add pcie clock support
      ARM: dove: Fix tauros2 device tree init
      ARM: dove: Fix clock names of sata and gbe
      ARM: dove: Restructure SoC device tree descriptor
      ARM: dove: Remove watchdog from DT
      ARM: dove: Add crypto engine to DT

 arch/arm/boot/dts/dove.dtsi |   49 ++++++++++++++++++++++++++++---------------
 arch/arm/mach-dove/common.c |    8 +++---
 arch/arm/mach-dove/pcie.c   |    5 ++++
 3 files changed, 41 insertions(+), 21 deletions(-)
Olof Johansson - Sept. 29, 2012, 9:09 p.m.
Hi,

On Mon, Sep 24, 2012 at 10:07:16PM -0400, Jason Cooper wrote:
> Depends:
>  - Based against arm-soc/for-next

Unfortunately this won't work. The arm-soc for-next branch is not a stable
branch, it's the aggregate where we merge in the contents of different next/*
branches for staging, but the branch itself doesn't get sent upstream.

Can you rebase this branch against something that makes more sense? Ideally the
branch that introduced the breakage, since that will minimize the upstream
exposure to the bugs.


-Olof
Jason - Sept. 29, 2012, 9:19 p.m.
On Sat, Sep 29, 2012 at 02:09:15PM -0700, Olof Johansson wrote:
> Hi,
> 
> On Mon, Sep 24, 2012 at 10:07:16PM -0400, Jason Cooper wrote:
> > Depends:
> >  - Based against arm-soc/for-next
> 
> Unfortunately this won't work. The arm-soc for-next branch is not a stable
> branch, it's the aggregate where we merge in the contents of different next/*
> branches for staging, but the branch itself doesn't get sent upstream.

ok.

> Can you rebase this branch against something that makes more sense? Ideally the
> branch that introduced the breakage, since that will minimize the upstream
> exposure to the bugs.

will do.  May be a couple of hours...

thx,

Jason.