On 12/04/2017 05:57 AM, Daniel Dragomir wrote:
Hello Bruce!Please review and merge this series of patches in Axxia branches from linux-yocto-4.1. Changes included in this series (axxia tag 1.69): Update the Axxia PCI LOS Work Around Support additional serial flash devices. Fix retention reset issue -- don't overwrite the entire pfuse register. EDAC Updates: Change the default log settings -- disable console output. Update configuration. Support 6700. Add CMEM debug feature. Handle fatal errors first. Add traces for L1/L2 debugging (/sys/kernel/debug/tracing/events/edac). Limit console output. Various fixes. If all the patches are ok, please pull them from https://github.com/axxia/axxia_yocto_linux_4.1_pull.git into git://git.yoctoproject.org/linux-yocto-4.1 Pull standard/axxia/base-1.69 -> standard/axxia/base standard/preempt-rt/axxia/base-1.69 -> standard/preempt-rt/axxia/base NOTE: Preempt-rt branch has one patch in addition to the standard one. 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.
No concerns from me. These look fine and are now merged. Bruce
Thank you, Daniel Dragomir John Jacques (8): drivers/net: Include Dependency for Axxia NEMAC drivers/net: Remove Reference to CONFIG_NET_VENDOR_LSI drivers/pci/host: Fix Axxia Compile Errors arch/arm64: Update the Axxia Device Trees drivers/tty: Fix a Compile Warning kernel: Fix a Compile Warning drivers/mtd/spi-nor: Add Support for Additional Devices drivers/pci: Update the Axxia PCI LOS Work Around Marek Majtyka (6): drivers/edac: Added CMEM debug feature drivers/edac: Cache edac driver fixes drivers/power/reset: Fix Axxia Retention Reset Issue drivers/edac: Added EDAC drivers for XLF board drivers/edac: Added linux style debug CMEM option drivers/edac: Changed default EDAC CE log settings .../devicetree/bindings/arm/axxia/edac_l1.txt | 15 +++ .../devicetree/bindings/arm/axxia/edac_l2.txt | 5 +- .../devicetree/bindings/arm/axxia/edac_l3.txt | 11 +- arch/arm64/boot/dts/intel/axc6732-waco.dts | 32 +++++ arch/arm64/boot/dts/intel/axc67xx.dtsi | 68 +++++++++++ arch/arm64/boot/dts/intel/axm5612-cpus.dtsi | 101 ++++++++++++++++ drivers/edac/Kconfig | 43 +++++++ drivers/edac/Makefile | 4 + drivers/edac/axxia_edac-cmc_56xx.c | 132 ++++++++++++++++++--- drivers/edac/axxia_edac-l2_cpu_56xx.c | 98 ++++++++++----- drivers/edac/axxia_edac-l3_56xx.c | 95 +++++++++++---- drivers/edac/axxia_edac-mc_56xx.c | 36 +++--- drivers/edac/edac_core.h | 17 ++- drivers/edac/edac_device.c | 105 +++++++++++++++- drivers/misc/lsi-ncr.c | 4 +- drivers/mtd/spi-nor/spi-nor.c | 2 + drivers/net/ethernet/Makefile | 1 - drivers/net/ethernet/intel/Kconfig | 1 + drivers/pci/host/pcie-axxia.c | 57 ++++----- drivers/power/reset/axxia-reset.c | 2 +- drivers/tty/serial/amba-pl011.c | 2 +- include/trace/events/edac.h | 77 ++++++++++++ include/trace/events/edacl3.h | 109 +++++++++++++++++ kernel/futex.c | 1 - 24 files changed, 887 insertions(+), 131 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/axxia/edac_l1.txt create mode 100644 arch/arm64/boot/dts/intel/axm5612-cpus.dtsi create mode 100644 include/trace/events/edac.h create mode 100644 include/trace/events/edacl3.h
-- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
