Merge remote-tracking branch 'mips/mips-next'

diff --cc arch/mips/Kconfig
index f4df8007fddbefea9f8c6588e8090a21b6b2830f,e49b5a0c85853f00df16bacc3593eae3692abead..44a51e2994cf70a573b1d9f85eb22382eb16d14a
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -495,22 -498,23 +499,23 @@@ config MIPS_MALT
        select BOOT_RAW
        select BUILTIN_DTB
        select CEVT_R4K
-       select CSRC_R4K
        select CLKSRC_MIPS_GIC
        select COMMON_CLK
+       select CSRC_R4K
        select DMA_MAYBE_COHERENT
        select GENERIC_ISA_DMA
-       select HAVE_PCSPKR_PLATFORM
-       select IRQ_MIPS_CPU
-       select MIPS_GIC
 +      select HAVE_PCI
+       select HAVE_PCSPKR_PLATFORM
 -      select HW_HAS_PCI
        select I8253
        select I8259
+       select IRQ_MIPS_CPU
+       select LIBFDT
        select MIPS_BONITO64
        select MIPS_CPU_SCACHE
+       select MIPS_GIC
        select MIPS_L1_CACHE_SHIFT_6
-       select PCI_GT64XXX_PCI0
        select MIPS_MSC
+       select PCI_GT64XXX_PCI0
        select SMP_UP if SMP
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1

diff --cc arch/mips/cavium-octeon/executive/cvmx-helper.c
index 6c79e8a16a2681f01cf4ffb0a702a8414499bf7b,d2251bb1f3697c14c3ecbfd9b3259a6deed551f2..a76bbcc30f954766466a5686b3c3dcd975f72ce5
--- 1/arch/mips/cavium-octeon/executive/cvmx-helper.c
--- 2/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@@ -46,28 -46,8 +46,8 @@@
  #include <asm/octeon/cvmx-smix-defs.h>
  #include <asm/octeon/cvmx-asxx-defs.h>
  
- /**
-  * cvmx_override_pko_queue_priority(int ipd_port, uint64_t
-  * priorities[16]) is a function pointer. It is meant to allow
-  * customization of the PKO queue priorities based on the port
-  * number. Users should set this pointer to a function before
-  * calling any cvmx-helper operations.
-  */
- void (*cvmx_override_pko_queue_priority) (int pko_port,
-                                         uint64_t priorities[16]);
- 
- /**
-  * cvmx_override_ipd_port_setup(int ipd_port) is a function
-  * pointer. It is meant to allow customization of the IPD port
-  * setup before packet input/output comes online. It is called
-  * after cvmx-helper does the default IPD configuration, but
-  * before IPD is enabled. Users should set this pointer to a
-  * function before calling any cvmx-helper operations.
-  */
- void (*cvmx_override_ipd_port_setup) (int ipd_port);
- 
  /* Port count per interface */
 -static int interface_port_count[5];
 +static int interface_port_count[9];
  
  /**
   * Return the number of interfaces the chip has. Each interface

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

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