linux-next: manual merge of the akpm-current tree with the kspp tree

[Stephen Rothwell]

Hi all,

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

  include/linux/compiler_types.h

between commit:

  380d53c45ff2 ("compiler_attributes.h: define __no_profile, add to noinstr")

from the kspp tree and commit:

  120ae5440ef0 ("kcov: add __no_sanitize_coverage to fix noinstr for all architectures")

from the akpm-current 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 include/linux/compiler_types.h
index d509169860f1,cc2bee7f0977..000000000000
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@@ -210,7 -210,7 +210,7 @@@ struct ftrace_likely_data 
  /* Section for code which can't be instrumented at all */
  #define noinstr								\
  	noinline notrace __attribute((__section__(".noinstr.text")))	\
- 	__no_kcsan __no_sanitize_address __no_profile
 -	__no_kcsan __no_sanitize_address __no_sanitize_coverage
++	__no_kcsan __no_sanitize_address __no_sanitize_coverage __no_profile
  
  #endif /* __KERNEL__ */

Attachment: pgp1LOI6CEakw.pgp
Description: OpenPGP digital signature