Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for 3.17.  It contains:

   - misc Cavium Octeon, BCM47xx, BCM63xx and Alchemy  updates
   - MIPS ptrace updates and cleanups
   - various fixes that will also go to -stable
   - a number of cleanups and small non-critical fixes.
   - NUMA support for the Loongson 3.
   - more support for MSA
   - support for MAAR
   - various FP enhancements and fixes"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (139 commits)
  MIPS: jz4740: remove unnecessary null test before debugfs_remove
  MIPS: Octeon: remove unnecessary null test before debugfs_remove_recursive
  MIPS: ZBOOT: implement stack protector in compressed boot phase
  MIPS: mipsreg: remove duplicate MIPS_CONF4_FTLBSETS_SHIFT
  MIPS: Bonito64: remove a duplicate define
  MIPS: Malta: initialise MAARs
  MIPS: Initialise MAARs
  MIPS: detect presence of MAARs
  MIPS: define MAAR register accessors & bits
  MIPS: mark MSA experimental
  MIPS: Don't build MSA support unless it can be used
  MIPS: consistently clear MSA flags when starting & copying threads
  MIPS: 16 byte align MSA vector context
  MIPS: disable preemption whilst initialising MSA
  MIPS: ensure MSA gets disabled during boot
  MIPS: fix read_msa_* & write_msa_* functions on non-MSA toolchains
  MIPS: fix MSA context for tasks which don't use FP first
  MIPS: init upper 64b of vector registers when MSA is first used
  MIPS: save/disable MSA in lose_fpu
  MIPS: preserve scalar FP CSR when switching vector context
  ...

diff --cc Documentation/kernel-parameters.txt
index 21ae0e4b9e7e7a4ac67d42b978a3700654d12229,ea4f2dfba19a66067527c37f3fde10190d20a7eb..664fd887cc37afcfa4096ff7ccbb450962bc6466
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -566,11 -566,12 +566,17 @@@ bytes respectively. Such letter suffixe
                        possible to determine what the correct size should be.
                        This option provides an override for these situations.
  
 +      ca_keys=        [KEYS] This parameter identifies a specific key(s) on
 +                      the system trusted keyring to be used for certificate
 +                      trust validation.
 +                      format: { id:<keyid> | builtin }
 +
+       cca=            [MIPS] Override the kernel pages' cache coherency
+                       algorithm.  Accepted values range from 0 to 7
+                       inclusive. See arch/mips/include/asm/pgtable-bits.h
+                       for platform specific values (SB1, Loongson3 and
+                       others).
+ 
        ccw_timeout_log [S390]
                        See Documentation/s390/CommonIO for details.
  

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/configs/loongson3_defconfig
Simple merge

diff --cc arch/mips/include/asm/processor.h
Simple merge

diff --cc arch/mips/kernel/ftrace.c
Simple merge

diff --cc arch/mips/kernel/mcount.S
Simple merge

diff --cc arch/mips/kernel/scall32-o32.S
Simple merge

diff --cc arch/mips/kernel/scall64-64.S
Simple merge

diff --cc arch/mips/kernel/scall64-n32.S
Simple merge

diff --cc arch/mips/kernel/scall64-o32.S
Simple merge

diff --cc drivers/spi/spi-au1550.c
Simple merge