Hello!

I applied the patches I sent you on standard/preempt-rt/axxia/base using 'git am' and they all apply fine with no errors.

What happens if you apply the patches on 'standard/axxia/base' and then merge it into 'standard/preempt-rt/axxia/base', like you did until now? Actually this was my intention from the beginning.

Thanks,
Cristian

On 05/15/2015 09:08 PM, Bruce Ashfield wrote:
On 2015-05-15 08:24 AM, Cristian Bercaru wrote:
Hello! Please apply this set of patches to linux-yocto-3.10, on the
following branches
   standard/axxia/base

The series applied here.

   standard/preempt-rt/axxia/base

But failed here.

Am I missing the series that syncs the baseline of the preempt-rt
branches with standard/axxia/base ?

Bruce


The patches contain various power management, SMP and PCIe fixes as
well as support for AXXIA AXM35xx TRNG.

Alexander Sverdlin (1):
   spi: pl022: Fix race in giveback() leading to driver lock-up

Anders Berg (3):
   arm: arch_timer: Avoid error in sched_clock conversion
   fs: vmfs: Use generic mmap function
   misc: lsi-ncr: Only use AMP lock on PPC platforms.

Charlie Paul (2):
   arch/arm/mach-axxia: Fix NO SMP compile failure
   arch/arm/mach-axxia: Fixed L2 power up failure

John Jacques (2):
   arch/arm/mach-axxia: Enable L3
   arch/arm/mach-axxia: changed affinity parameter to cpu

Magnus Karlsson (5):
   Revert "arch/arm/mach-axxia: fixed hang in preempt kernel"
   Revert "arch/arm/mach-axxia: fixed failure to power up cluster"
   Revert "arch/arm/mach-axxia: Fixed affinity error on IRQ migration"
   ARM: irq: Return error when set_affinity is called from hotplug
   ARM: axxia: Add cluster and L2 power off in hotplug

Palani (2):
   rionet: Fix the corruption of tx_cnt during Transmit.
   AXM55xx RapidIO : Added support for Device revision and link down
     Monitor.

Sangeetha Rao (4):
   arch/arm/mach-axxia: Updated PCIe driver doorbell support to use DTS
     entries
   arch/arm/mach-axxia: Updated Axxia 55xx PCIe driver to use correct
     Doorbell interrupt IRQs
   arch/arm/mach-axxia: Fixed compile warning in AXM55xx PCIe driver
   drivers/edac: Fixed compile warning in AXM55xx L3 EDAC driver

Sreedevi Joshi (2):
   char: hwrng: AXXIA TRNG driver added for AXM55xx
   char: hwrng: AXXIA AXM35xx TRNG driver support

  arch/arm/boot/dts/axm5508-amarillo.dts        |    4 +
  arch/arm/boot/dts/axm5512-amarillo.dts        |    4 +
  arch/arm/boot/dts/axm5516-amarillo.dts        |    4 +
  arch/arm/boot/dts/axm55xx.dtsi                |   11 +-
  arch/arm/kernel/arch_timer.c                  |   20 +-
  arch/arm/mach-axxia/Makefile                  |    2 +-
  arch/arm/mach-axxia/axxia-gic.c               |  504
+++++++++--------------
  arch/arm/mach-axxia/axxia.c                   |    7 +-
  arch/arm/mach-axxia/axxia.h                   |    5 +
  arch/arm/mach-axxia/axxia_circular_queue.c    |   63 ---
  arch/arm/mach-axxia/axxia_circular_queue.h    |   30 --
  arch/arm/mach-axxia/ddr_retention.c           |    5 +-
  arch/arm/mach-axxia/hotplug.c                 |    8 +-
  arch/arm/mach-axxia/include/mach/axxia-gic.h  |    3 +-
  arch/arm/mach-axxia/lsi_power_management.c    |   63 +--
  arch/arm/mach-axxia/pci.c                     |   33 +-
  arch/arm/mach-axxia/platsmp.c                 |   18 +-
  arch/powerpc/boot/dts/acp35xx.dts             |   10 +
  drivers/char/hw_random/Kconfig                |    9 +
  drivers/char/hw_random/Makefile               |    1 +
  drivers/char/hw_random/axxia-rng.c            |  548
+++++++++++++++++++++++++
  drivers/edac/axxia_edac-l3.c                  |    2 +-
  drivers/misc/lsi-ncr.c                        |  219 ++++------
  drivers/net/rionet.c                          |    4 +-
  drivers/rapidio/devices/lsi/axxia-rio-irq.c   |   49 ++-
  drivers/rapidio/devices/lsi/axxia-rio-sysfs.c |   18 +
  drivers/rapidio/devices/lsi/axxia-rio.c       |   28 +-
  drivers/rapidio/devices/lsi/axxia-rio.h       |    8 +-
  drivers/spi/spi-pl022.c                       |    2 +-
  fs/vmfs/file.c                                |   23 +-
  30 files changed, 1004 insertions(+), 701 deletions(-)
  delete mode 100644 arch/arm/mach-axxia/axxia_circular_queue.c
  delete mode 100644 arch/arm/mach-axxia/axxia_circular_queue.h
  create mode 100644 drivers/char/hw_random/axxia-rng.c



--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Reply via email to