Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · ac3c4aa2
    Linus Torvalds authored
    Pull MIPS updates from James Hogan:
     "math-emu:
       - Add missing clearing of BLTZALL and BGEZALL emulation counters
       - Fix BC1EQZ and BC1NEZ condition handling
       - Fix BLEZL and BGTZL identification
    
      BPF:
       - Add JIT support for SKF_AD_HATYPE
       - Use unsigned access for unsigned SKB fields
       - Quit clobbering callee saved registers in JIT code
       - Fix multiple problems in JIT skb access helpers
    
      Loongson 3:
       - Select MIPS_L1_CACHE_SHIFT_6
    
      Octeon:
       - Remove vestiges of CONFIG_CAVIUM_OCTEON_2ND_KERNEL
       - Remove unused L2C types and macros.
       - Remove unused SLI types and macros.
       - Fix compile error when USB is not enabled.
       - Octeon: Remove unused PCIERCX types and macros.
       - Octeon: Clean up platform code.
    
      SNI:
       - Remove recursive include of cpu-feature-overrides.h
    
      Sibyte:
       - Export symbol periph_rev to sb1250-mac network driver.
       - Fix Kconfig warning.
    
      Generic platform:
       - Enable Root FS on NFS in generic_defconfig
    
      SMP-MT:
       - Use CPU interrupt controller IPI IRQ domain support
    
      UASM:
       - Add support for LHU for uasm.
       - Remove needless ISA abstraction
    
      mm:
       - Add 48-bit VA space and 4-level page tables for 4K pages.
    
      PCI:
       - Add controllers before the specified head
    
      irqchip driver for MIPS CPU:
       - Replace magic 0x100 with IE_SW0
       - Prepare for non-legacy IRQ domains
       - Introduce IPI IRQ domain support
    
      MAINTAINERS:
       - Update email-id of Rahul Bedarkar
    
      NET:
       - sb1250-mac: Add missing MODULE_LICENSE()
    
      CPUFREQ:
       - Loongson2: drop set_cpus_allowed_ptr()
    
      Misc:
       - Disable Werror when W= is set
       - Opt into HAVE_COPY_THREAD_TLS
       - Enable GENERIC_CPU_AUTOPROBE
       - Use common outgoing-CPU-notification code
       - Remove dead define of ST_OFF
       - Remove CONFIG_ARCH_HAS_ILOG2_U{32,64}
       - Stengthen IPI IRQ domain sanity check
       - Remove confusing else statement in __do_page_fault()
       - Don't unnecessarily include kmalloc.h into <asm/cache.h>.
       - Delete unused definition of SMP_CACHE_SHIFT.
       - Delete redundant definition of SMP_CACHE_BYTES"
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (39 commits)
      MIPS: Sibyte: Fix Kconfig warning.
      MIPS: Sibyte: Export symbol periph_rev to sb1250-mac network driver.
      NET: sb1250-mac: Add missing MODULE_LICENSE()
      MAINTAINERS: Update email-id of Rahul Bedarkar
      MIPS: Remove confusing else statement in __do_page_fault()
      MIPS: Stengthen IPI IRQ domain sanity check
      MIPS: smp-mt: Use CPU interrupt controller IPI IRQ domain support
      irqchip: mips-cpu: Introduce IPI IRQ domain support
      irqchip: mips-cpu: Prepare for non-legacy IRQ domains
      irqchip: mips-cpu: Replace magic 0x100 with IE_SW0
      MIPS: Remove CONFIG_ARCH_HAS_ILOG2_U{32,64}
      MIPS: generic: Enable Root FS on NFS in generic_defconfig
      MIPS: mach-rm: Remove recursive include of cpu-feature-overrides.h
      MIPS: Opt into HAVE_COPY_THREAD_TLS
      CPUFREQ: Loongson2: drop set_cpus_allowed_ptr()
      MIPS: uasm: Remove needless ISA abstraction
      MIPS: Remove dead define of ST_OFF
      MIPS: Use common outgoing-CPU-notification code
      MIPS: math-emu: Fix BC1EQZ and BC1NEZ condition handling
      MIPS: r2-on-r6-emu: Clear BLTZALL and BGEZALL debugfs counters
      ...
    ac3c4aa2