Please pull 'next' branch of 4xx tree

3 messages, 2 authors, 2011-08-30 · open the first message on its own page

Please pull 'next' branch of 4xx tree

From: Josh Boyer <hidden>
Date: 2011-08-10 18:26:36

Hi Ben,

Finally somewhat caught up.  Now that -rc1 is out, here are some
patches for the next merge window.

josh

The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c03:

  Merge branch 'devicetree/merge' of
git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000)

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next

Ayman El-Khashab (1):
      powerpc/4xx: enable and fix pcie gen1/gen2 on the 460sx

Josh Boyer (1):
      powerpc/40x: Remove obsolete HCU4 board

Mike Williams (1):
      powerpc/4xx: edac: Add comma to fix build error

Stefan Roese (1):
      powerpc/44x: Add NOR flash device to Yosemite dts

Suzuki Poulose (1):
      powerpc/44x: Kexec support for PPC440X chipsets

 arch/powerpc/Kconfig                    |    2 +-
 arch/powerpc/boot/dts/hcu4.dts          |  168 ------------------------------
 arch/powerpc/boot/dts/yosemite.dts      |   36 +++++++
 arch/powerpc/configs/40x/hcu4_defconfig |   80 --------------
 arch/powerpc/configs/ppc40x_defconfig   |    1 -
 arch/powerpc/include/asm/kexec.h        |    2 +-
 arch/powerpc/kernel/misc_32.S           |  171 +++++++++++++++++++++++++++++++
 arch/powerpc/platforms/40x/Kconfig      |    8 --
 arch/powerpc/platforms/40x/Makefile     |    1 -
 arch/powerpc/platforms/40x/hcu4.c       |   61 -----------
 arch/powerpc/sysdev/ppc4xx_pci.c        |   89 +++++++++++++---
 arch/powerpc/sysdev/ppc4xx_pci.h        |   12 ++
 drivers/edac/ppc4xx_edac.c              |    2 +-
 13 files changed, 294 insertions(+), 339 deletions(-)
 delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
 delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
 delete mode 100644 arch/powerpc/platforms/40x/hcu4.c

Re: Please pull 'next' branch of 4xx tree

From: Josh Boyer <hidden>
Date: 2011-08-29 13:05:38

On Wed, Aug 10, 2011 at 2:26 PM, Josh Boyer [off-list ref] wrote:
Hi Ben,

Finally somewhat caught up. =A0Now that -rc1 is out, here are some
patches for the next merge window.

josh

The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c=
03:
=A0Merge branch 'devicetree/merge' of
git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000)

are available in the git repository at:

=A0ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.g=
it next

Ben, ping?

josh

Re: Please pull 'next' branch of 4xx tree

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2011-08-30 03:09:16

On Mon, 2011-08-29 at 09:05 -0400, Josh Boyer wrote:
On Wed, Aug 10, 2011 at 2:26 PM, Josh Boyer [off-list ref] wrote:
quoted
Hi Ben,

Finally somewhat caught up.  Now that -rc1 is out, here are some
patches for the next merge window.

josh

The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c03:

 Merge branch 'devicetree/merge' of
git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000)

are available in the git repository at:

 ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next
Ben, ping?
Been on & off & travelling. Will deal with this some time this week.

Cheers,
Ben.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help