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

[Bruce Ashfield]

On 12/01/2015 11:23 PM, Cristian Bercaru wrote:
> Hello!
>
> This series of patches brings various improvements to the Intel Axxia
> drivers from linux-yocto-3.14, including NCR and femac.
>
> Please pull the patches from
> https://github.com/lsigithub/axxia_yocto_linux_3.14_pull.git
> into
> git://git.yoctoproject.org/linux-yocto-3.14
> Pull
> standard/axxia/base-1.3 -> standard/axxia/base
> standard/preempt-rt/axxia/base-1.3 -> 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.

Bruce

>
> Thank you,
> Cristian Bercaru
>
> John Jacques (6):
>    axxia: Checkpatch Cleanup
>    arch/arm/mach-axxia: RTE Reset Flag
>    axxia: Clean Up Axxia NCR Driver
>    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
>
> Sreedevi Joshi (1):
>    net: femac: Possible deadlock during nfs mount fixed
>
>   arch/arm/include/asm/lsi/acp_ncr.h     |  45 ----
>   arch/arm/mach-axxia/axxia.c            |  35 +--
>   arch/arm/mach-axxia/axxia.h            |  11 +
>   arch/arm/mach-axxia/ddr_retention.c    |  72 +++---
>   arch/arm/mach-axxia/include/mach/ncr.h |  44 ----
>   arch/powerpc/include/asm/lsi/acp_ncr.h |  45 ----
>   arch/powerpc/sysdev/lsi_acp_ncr.c      | 377 -------------------------------
>   arch/powerpc/sysdev/lsi_msi.c          |   2 +-
>   arch/powerpc/sysdev/lsi_pci.c          |  57 ++---
>   drivers/edac/axxia_edac-l2_cpu.c       |   2 +-
>   drivers/edac/axxia_edac-l3.c           |   4 +-
>   drivers/edac/axxia_edac-mc.c           |   2 +-
>   drivers/misc/lsi-ncr.c                 | 399 +++++++++++++++++++++------------
>   drivers/misc/lsi-ncr.h                 |  45 ----
>   drivers/net/ethernet/lsi/lsi_acp_net.c |  32 ++-
>   drivers/net/ethernet/lsi/lsi_acp_net.h |   1 +
>   include/linux/lsi-ncr.h                |  44 ++++
>   17 files changed, 428 insertions(+), 789 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/powerpc/include/asm/lsi/acp_ncr.h
>   delete mode 100644 arch/powerpc/sysdev/lsi_acp_ncr.c
>   delete mode 100644 drivers/misc/lsi-ncr.h
>   create mode 100644 include/linux/lsi-ncr.h
>