[linux-yocto] [PULL REQUEST] Intel Axxia updates to linux-yocto-3.4

[Bruce Ashfield]

On 12/01/2015 11:20 PM, Cristian Bercaru wrote:
> Hello!
>
> This series of patches brings various improvements to the Intel Axxia
> drivers from linux-yocto-3.4, including NCR and femac.
>
> Please pull the patches from
> https://github.com/lsigithub/lsi_axxia_yocto_pull.git
> into
> git://git.yoctoproject.org/linux-yocto-3.4.git
> Pull
> standard/axxia/base-7.8.1.50-v2 -> standard/axxia/base
> standard/preempt-rt/axxia/base-7.8.1.50-v2 -> standard/preempt-rt/axxia/base
>
> If you add more patches to standard/(preempt-rt)/axxia/base beforehand
> please notify me. I will rebase our changes so you can do a clean,
> fast-forward pull.

merged to 3.4

Bruce

>
> Thank you,
> Cristian Bercaru
>
> John Jacques (8):
>    drivers/misc/lsi-ncr.c: Cleanup and Performance
>    arch/arm/mach-axxia: Fix Build Error when CONFIG_SMP=y
>    arch/powerpc/axxia: Fix Build Error when SMP is Not Enabled
>    drivers/misc: Further NCR Cleanup
>    net: femac: Possible deadlock during nfs mount fixed.
>    drivers/misc/lsi-ncr.c: Move the Header to the Default Path
>    axxia: Remove References to AXXIA_NCR_RESET_CHECK
>    drivers/net: Update the LSI FEMAC Driver for Axxia
>
>   arch/arm/include/asm/lsi/acp_ncr.h     |   45 ---
>   arch/arm/mach-axxia/Makefile           |    1 -
>   arch/arm/mach-axxia/axxia-gic.c        |    6 +
>   arch/arm/mach-axxia/axxia.c            |    3 -
>   arch/arm/mach-axxia/ddr_retention.c    |    2 +-
>   arch/arm/mach-axxia/include/mach/ncr.h |   44 ---
>   arch/arm/mach-axxia/ncr.c              |  597 -----------------------------
>   arch/arm/mach-axxia/rapidio.c          |    4 +-
>   arch/powerpc/kernel/traps.c            |   13 +-
>   arch/powerpc/sysdev/lsi_msi.c          |    4 +-
>   arch/powerpc/sysdev/lsi_pci.c          |    2 +-
>   drivers/misc/Kconfig                   |    2 +-
>   drivers/misc/lsi-ncr.c                 |  656 +++++++++++++++++++++++---------
>   drivers/misc/lsi-ncr.h                 |   42 --
>   drivers/misc/lsi-smmon.c               |    3 +-
>   drivers/net/ethernet/lsi/lsi_acp_net.c |   22 +-
>   drivers/net/ethernet/lsi/lsi_acp_net.h |    1 +
>   include/linux/lsi-ncr.h                |   44 +++
>   18 files changed, 563 insertions(+), 928 deletions(-)
>   delete mode 100644 arch/arm/include/asm/lsi/acp_ncr.h
>   delete mode 100644 arch/arm/mach-axxia/include/mach/ncr.h
>   delete mode 100644 arch/arm/mach-axxia/ncr.c
>   delete mode 100644 drivers/misc/lsi-ncr.h
>   create mode 100644 include/linux/lsi-ncr.h
>