• Linus Torvalds's avatar
    Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux · 763f9694
    Linus Torvalds authored
    Pull MIPS updates from James Hogan:
     "These are the main MIPS changes for 4.18.
    
      Rough overview:
    
       - MAINTAINERS: Add Paul Burton as MIPS co-maintainer
    
       - Misc: Generic compiler intrinsics, Y2038 improvements, Perf+MT fixes
    
       - Platform support: Netgear WNR1000 V3, Microsemi Ocelot integrated
         switch, Ingenic watchdog cleanups
    
      More detailed  summary:
    
      Maintainers:
    
       - Add Paul Burton as MIPS co-maintainer, as I soon won't have access
         to much MIPS hardware, nor enough time to properly maintain MIPS on
         my own.
    
      Miscellaneous:
    
       - Use generic GCC library routines from lib/
         - Add notrace to generic ucmpdi2 implementation
         - Rename compiler intrinsic selects to GENERIC_LIB_*
         - vmlinuz: Use generic ashldi3
    
       - y2038: Convert update/read_persistent_clock() to *_clock64()
         - sni: Remove read_persistent_clock()
    
       - perf: Fix perf with MT counting other threads
         - Probe for per-TC perf counters in cpu-probe.c
         - Use correct VPE ID for VPE tracing
    
      Minor cleanups:
    
       - Avoid unneeded built-in.a in DTS dirs
    
       - sc-debugfs: Re-use kstrtobool_from_user
    
       - memset.S: Reinstate delay slot indentation
    
       - VPE: Fix spelling "uneeded" -> "Unneeded"
    
      Platform support:
    
      BCM47xx:
    
       - Add support for Netgear WNR1000 V3
    
       - firmware: Support small NVRAM partitions
    
       - Use __initdata for LEDs platform data
    
      Ingenic:
    
       - Watchdog driver & platform code improvements:
         - Disable clock after stopping counter
         - Use devm_* functions
         - Drop module remove function
         - Move platform reset code to restart handler in driver
         - JZ4740: Convert watchdog instantiation to DT
         - JZ4780: Fix watchdog DT node
         - qi_lb60_defconfig: Enable watchdog driver
    
      Microsemi:
    
       - Ocelot: Add support for integrated switch
         - pcb123: Connect phys to ports"
    
    * tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits)
      MAINTAINERS: Add Paul Burton as MIPS co-maintainer
      MIPS: ptrace: Make FPU context layout comments match reality
      MIPS: memset.S: Reinstate delay slot indentation
      MIPS: perf: Fix perf with MT counting other threads
      MIPS: perf: Use correct VPE ID when setting up VPE tracing
      MIPS: perf: More robustly probe for the presence of per-tc counters
      MIPS: Probe for MIPS MT perf counters per TC
      MIPS: mscc: Connect phys to ports on ocelot_pcb123
      MIPS: mscc: Add switch to ocelot
      MIPS: JZ4740: Drop old platform reset code
      MIPS: qi_lb60: Enable the jz4740-wdt driver
      MIPS: JZ4780: dts: Fix watchdog node
      MIPS: JZ4740: dts: Add bindings for the jz4740-wdt driver
      watchdog: JZ4740: Drop module remove function
      watchdog: JZ4740: Register a restart handler
      watchdog: JZ4740: Use devm_* functions
      watchdog: JZ4740: Disable clock after stopping counter
      MIPS: VPE: Fix spelling mistake: "uneeded" -> "unneeded"
      MIPS: Re-use kstrtobool_from_user()
      MIPS: Convert update_persistent_clock() to update_persistent_clock64()
      ...
    763f9694
ptrace.c 26.2 KB