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

Conflicts:
	arch/mips/kernel/perf_event_mipsxx.c

diff --cc arch/mips/kernel/perf_event_mipsxx.c
index 315fc0b250f8fe3373684f12f5c0437fd3d0b7b1,bda4bc9e6988bcab40f6b5513748c861d7a0adec..e3b897acfbc04b3db1cbd29a37a423ccca4df815
--- 1/arch/mips/kernel/perf_event_mipsxx.c
--- 2/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@@ -731,16 -710,16 +710,16 @@@ static int validate_group(struct perf_e
  
        memset(&fake_cpuc, 0, sizeof(fake_cpuc));
  
-       if (!validate_event(&fake_cpuc, leader))
+       if (mipsxx_pmu_alloc_counter(&fake_cpuc, &leader->hw) < 0)
 -              return -ENOSPC;
 +              return -EINVAL;
  
        list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
-               if (!validate_event(&fake_cpuc, sibling))
+               if (mipsxx_pmu_alloc_counter(&fake_cpuc, &sibling->hw) < 0)
 -                      return -ENOSPC;
 +                      return -EINVAL;
        }
  
-       if (!validate_event(&fake_cpuc, event))
+       if (mipsxx_pmu_alloc_counter(&fake_cpuc, &event->hw) < 0)
 -              return -ENOSPC;
 +              return -EINVAL;
  
        return 0;
  }

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/Makefile
Simple merge