Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · ab57a611
    Linus Torvalds authored
    Pull MIPS fixes from Ralf Baechle:
     "Here's the first round of MIPS fixes after the merge window:
    
       - Detect Octeon III's PCI correctly.
       - Fix return value of the MT7620 probing function.
       - Wire up the copy_file_range syscall.
       - Fix 64k page support on 32 bit kernels.
       - Fix the early Coherency Manager probe.
       - Allow only hardware-supported page sizes to be selected for R6000.
       - Fix corner cases for the RDHWR nstruction emulation on old hardware.
       - Fix FPU handling corner cases.
       - Remove stale entry for BCM33xx from the MAINTAINERS file.
       - 32 and 64 bit ELF headers are different, handle them correctly"
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
      mips: Differentiate between 32 and 64 bit ELF header
      MIPS: Octeon: Update OCTEON_FEATURE_PCIE for Octeon III
      MIPS: pci-mt7620: Fix return value check in mt7620_pci_probe()
      MIPS: Fix early CM probing
      MIPS: Wire up copy_file_range syscall.
      MIPS: Fix 64k page support for 32 bit kernels.
      MIPS: R6000: Don't allow 64k pages for R6000.
      MIPS: traps.c: Correct microMIPS RDHWR emulation
      MIPS: traps.c: Don't emulate RDHWR in the CpU #0 exception handler
      MAINTAINERS: Remove stale entry for BCM33xx chips
      MIPS: Fix FPU disable with preemption
      MIPS: Properly disable FPU in start_thread()
      MIPS: Fix buffer overflow in syscall_get_arguments()
    ab57a611