Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	arch/mips/kernel/perf_event_mipsxx.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/kernel/perf_event.c
index 172101ac97de5a1125a014a02f1c1d71922a1640,ff17b17b668eeed1c5930748a3c480e623c13298..a4f192cc51b23b3d75935a0e550c7f8a4cd6b12d
--- 1/arch/arm/kernel/perf_event.c
--- 2/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@@ -336,17 -343,11 +336,17 @@@ validate_group(struct perf_event *event
  {
        struct perf_event *sibling, *leader = event->group_leader;
        struct pmu_hw_events fake_pmu;
 +      DECLARE_BITMAP(fake_used_mask, ARMPMU_MAX_HWEVENTS);
  
 -      memset(&fake_pmu, 0, sizeof(fake_pmu));
 +      /*
 +       * Initialise the fake PMU. We only need to populate the
 +       * used_mask for the purposes of validation.
 +       */
 +      memset(fake_used_mask, 0, sizeof(fake_used_mask));
 +      fake_pmu.used_mask = fake_used_mask;
  
        if (!validate_event(&fake_pmu, leader))
-               return -ENOSPC;
+               return -EINVAL;
  
        list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
                if (!validate_event(&fake_pmu, sibling))

diff --cc arch/mips/kernel/perf_event_mipsxx.c
index bda4bc9e6988bcab40f6b5513748c861d7a0adec,315fc0b250f8fe3373684f12f5c0437fd3d0b7b1..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
@@@ -710,16 -731,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 include/linux/init_task.h
Simple merge

diff --cc kernel/sched.c
Simple merge