linux-next: manual merge of the akpm tree with the rr-fixes tree

linux-next: manual merge of the akpm tree with the rr-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
include/linux/kernel.h between commit cbdbf2abb784 ("linux/kernel.h:
define SYMBOL_PREFIX") from the rr-fixes tree and commit "mm: use
IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD" from the akpm
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/kernel.h
index 69ddcb3,1e98564..0000000
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -684,20 -684,6 +684,13 @@@ static inline void ftrace_dump(enum ftr
  /* Trap pasters of __FUNCTION__ at compile-time */
  #define __FUNCTION__ (__func__)
  
- /* This helps us avoid #ifdef CONFIG_COMPACTION */
- #ifdef CONFIG_COMPACTION
- #define COMPACTION_BUILD 1
- #else
- #define COMPACTION_BUILD 0
- #endif
- 
 +/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */
 +#ifdef CONFIG_SYMBOL_PREFIX
 +#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
 +#else
 +#define SYMBOL_PREFIX ""
 +#endif
 +
  /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
  # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]