linux-kernel - linux-next: manual merge of the akpm-current tree with the v4l-dvb 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: <20150410201736.7f5d8237@canb.auug.org.au>
Date:	Fri, 10 Apr 2015 20:17:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arnd Bergmann <arnd@...db.de>,
	Michal Simek <michal.simek@...inx.com>
Subject: linux-next: manual merge of the akpm-current tree with the v4l-dvb
 tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/kconfig.h between commit 9b174527e7b7 ("[media] Add and
use IS_REACHABLE macro") from the v4l-dvb tree and commit 85ca6a006505
("kconfig-use-macros-which-are-already-defined-fix") from the
akpm-current 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/kconfig.h
index 16cfb3448568,63ca8dacec59..000000000000
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@@ -44,12 -36,10 +36,19 @@@
  #define IS_MODULE(option) config_enabled(option##_MODULE)
  
  /*
+  * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
+  * 0 otherwise.
+  */
+ #define IS_ENABLED(option) \
+ 	(IS_BUILTIN(option) || IS_MODULE(option))
+ 
++/*
 + * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled
 + * code can call a function defined in code compiled based on CONFIG_FOO.
 + * This is similar to IS_ENABLED(), but returns false when invoked from
 + * built-in code when CONFIG_FOO is set to 'm'.
 + */
 +#define IS_REACHABLE(option) (config_enabled(option) || \
 +		 (config_enabled(option##_MODULE) && config_enabled(MODULE)))
 +
  #endif /* __LINUX_KCONFIG_H */

Content of type "application/pgp-signature" skipped