linux-next: manual merge of the perf tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the perf tree got a conflict in:

  tools/perf/util/evsel.c

between commit:

  49c692b7dfc9 ("perf offcpu: Accept allowed sample types only")

from Linus' tree and commit:

  9ab95b0b15a0 ("perf record ibs: Warn about sampling period skew")

from the perf tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/perf/util/evsel.c
index 094b0a9c0bc0,8fea51a9cd90..000000000000
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@@ -1373,8 -1372,7 +1378,10 @@@ void evsel__config(struct evsel *evsel
  	if (evsel__is_dummy_event(evsel))
  		evsel__reset_sample_bit(evsel, BRANCH_STACK);
  
 +	if (evsel__is_offcpu_event(evsel))
 +		evsel->core.attr.sample_type &= OFFCPU_SAMPLE_TYPES;
++
+ 	arch__post_evsel_config(evsel, attr);
  }
  
  int evsel__set_filter(struct evsel *evsel, const char *filter)

Attachment: pgpOAAwlJh0vJ.pgp
Description: OpenPGP digital signature