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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20121204163750.2dd78499285ede7157b1d5b8@canb.auug.org.au>
Date:	Tue, 4 Dec 2012 16:37:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Hogan <james.hogan@...tec.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>
Subject: linux-next: manual merge of the akpm tree with the rr-fixes tree

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@...b.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

Content of type "application/pgp-signature" skipped