[linux-yocto] [PULL REQUEST] Kernel: 3.10 Branch: standard/axxia/base

[Bruce Ashfield]

On 14-06-19 05:02 PM, Paul, Charlie wrote:
> The following changes since commit 0651cf0a88bb3a8026328436bffc72da221f6ddf:
>
>    Merge branch 'standard/base' into standard/axxia/base (2014-06-16
> 12:25:09 -0400)

Can you rebase this branch onto the latest standard/axxia/base ? I'm
getting conflicts when doing the rebase here, and you are better to
resolve them.

You may already have attempted this, since your branch has a merge
commit on top, but I'd like rebased/clean series that I can merge.

Bruce

>
> are available in the git repository at:
>
>    https://github.com/z8cpaul/lsikernel-3.10 sab-next
>
> for you to fetch changes up to d55b27f965f65b2d4b459e66c4f57093ce3646fc:
>
>    Merge branch 'sab-next' of https://github.com/z8cpaul/lsikernel-3.10
> into sab-next (2014-06-19 13:57:45 -0700)
>
> ----------------------------------------------------------------
>
> Anders Berg (11):
>
>        i2c: axxia: Minor cosmetic cleanup
>
>        i2c: axxia: Fall back to polling mode when no IRQ
>
>        misc: lsi-smmon: Bug when probing with IRQ pending
>
>        misc: lsi-smmon: Add parameter panic_on_fatal
>
>        ARM: dts: axxia: Added memory controllers
>
>        dma: lsi-dma32: Add support for sg operation
>
>        dma: lsi-dma32: Remove debug printks
>
>        ARM: dts: axxia: Fix flash partitions
>
>        dma: lsi-dma32: Add support for sg operation
>
>        dma: lsi-dma32: Remove debug printks
>
>        ARM: dts: axxia: Fix flash partitions
>
> Charlie Paul (1):
>
>        Merge branch 'sab-next' of
> https://github.com/z8cpaul/lsikernel-3.10 into sab-next
>
> John Jacques (11):
>
>        arch/arm/mach-axxia: Enable Secondary Cores when in Hyp Mode
>
>        arch/arm/mach-axxia: Remove Unused Device Tree
>
>        arch/arm/mach-axxia: Device Trees for New 5500 Variants
>
>        board/powerpc: Update the Device Tree for 3500
>
>        arch/arm: virtio
>
>        arch/arm: Add Virtio Block Support to Axxia Simulation
>
>        arch/arm/mach-axxia: Update Device Tree for KVM
>
>        board/powerpc: Update the Device Tree for 3500
>
>        arch/arm: virtio
>
>        arch/arm: Add Virtio Block Support to Axxia Simulation
>
>        arch/arm/mach-axxia: Update Device Tree for KVM
>
> Palani (2):
>
>        LSI AXM55xx RAPIDIO: Added support for the sRIO controller in the
> AXM55xx devices.
>
>        LSI AXM55xx RAPIDIO: Added support for the sRIO controller in the
> AXM55xx devices.
>
> SangeethaRao (2):
>
>        sysdev LSI_POWERPC: Adding 3500 PCIe inbound mapping support
>
>        sysdev LSI_POWERPC: Adding 3500 PCIe inbound mapping support
>
> arch/arm/Kconfig                              |   13 +
>
> arch/arm/boot/dts/axm5504-sim.dts             |    6 +
>
> arch/arm/boot/dts/axm5508-amarillo.dts        |    2 +-
>
> arch/arm/boot/dts/axm5512-amarillo.dts        |    2 +-
>
> arch/arm/boot/dts/axm5516-amarillo.dts        |    2 +-
>
> arch/arm/boot/dts/axm5516-sim.dts             |    6 +
>
> arch/arm/boot/dts/axm55xx.dtsi                |    1 +
>
> arch/arm/mach-axxia/Makefile                  |    1 +
>
> arch/arm/mach-axxia/axxia.c                   |    7 +
>
> arch/arm/mach-axxia/include/mach/rio.h        |   44 +
>
> arch/arm/mach-axxia/rapidio.c                 |  108 ++
>
> arch/powerpc/boot/dts/acp35xx.dts             |   68 +-
>
> arch/powerpc/sysdev/lsi_pci.c                 |   42 +-
>
> drivers/dma/lsi-dma32.c                       |  233 ++-
>
> drivers/dma/lsi-dma32.h                       |    7 +-
>
> drivers/rapidio/devices/Kconfig               |    2 +
>
> drivers/rapidio/devices/Makefile              |    2 +
>
> drivers/rapidio/devices/lsi/Kconfig           |   47 +
>
> drivers/rapidio/devices/lsi/Makefile          |    5 +
>
> drivers/rapidio/devices/lsi/axxia-rio-irq.c   | 2532
> +++++++++++++++++++++++++
>
> drivers/rapidio/devices/lsi/axxia-rio-irq.h   |  195 ++
>
> drivers/rapidio/devices/lsi/axxia-rio-sysfs.c |  278 +++
>
> drivers/rapidio/devices/lsi/axxia-rio.c       | 1751 +++++++++++++++++
>
> drivers/rapidio/devices/lsi/axxia-rio.h       |  595 ++++++
>
> 24 files changed, 5829 insertions(+), 120 deletions(-)
>
> create mode 100644 arch/arm/mach-axxia/include/mach/rio.h
>
> create mode 100644 arch/arm/mach-axxia/rapidio.c
>
> create mode 100644 drivers/rapidio/devices/lsi/Kconfig
>
> create mode 100644 drivers/rapidio/devices/lsi/Makefile
>
> create mode 100644 drivers/rapidio/devices/lsi/axxia-rio-irq.c
>
> create mode 100644 drivers/rapidio/devices/lsi/axxia-rio-irq.h
>
> create mode 100644 drivers/rapidio/devices/lsi/axxia-rio-sysfs.c
>
> create mode 100644 drivers/rapidio/devices/lsi/axxia-rio.c
>
> create mode 100644 drivers/rapidio/devices/lsi/axxia-rio.h
>