linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/kernel/perf_event_mipsxx.c between commit f40c522a4216
("MIPS/Perf-events: Remove erroneous check on active_events") and
c481e48d9478 ("MIPS/Perf-events: Remove pmu and event state checking in
validate_event()") from the mips tree and commit aa2bc1ade590 ("perf:
Don't use -ENOSPC for out of PMU resources") from the tip tree.

Just context changes (and one hunk was removed).  I fixed it up (see
below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/mips/kernel/perf_event_mipsxx.c
index bda4bc9,315fc0b..0000000
--- a/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;
  }

Attachment: pgp00000.pgp
Description: PGP signature