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

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

[Stephen Rothwell]

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

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@canb.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 */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

Hi Andrew,

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

  mm/Kconfig

between commit:

  8025e5ddf9c1 ("[media] mm: Provide new get_vaddr_frames() helper")

from the v4l-dvb tree and commit:

  f0b1a174238f ("proc: add kpageidle file")

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@canb.auug.org.au

diff --cc mm/Kconfig
index 0fb2e96653fe,01c302547e07..000000000000
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -649,5 -655,14 +649,17 @@@ config DEFERRED_STRUCT_PAGE_INI
  	  processes running early in the lifetime of the systemm until kswapd
  	  finishes the initialisation.
  
 +config FRAME_VECTOR
 +	bool
++
+ config IDLE_PAGE_TRACKING
+ 	bool "Enable idle page tracking"
+ 	depends on SYSFS && MMU
+ 	select PAGE_EXTENSION if !64BIT
+ 	help
+ 	  This feature allows to estimate the amount of user pages that have
+ 	  not been touched during a given period of time. This information can
+ 	  be useful to tune memory cgroup limits and/or for job placement
+ 	  within a compute cluster.
+ 
+ 	  See Documentation/vm/idle_page_tracking.txt for more details.

Re: linux-next: manual merge of the akpm-current tree with the v4l-dvb tree

[Stephen Rothwell]

Hi Andrew,

On Tue, 18 Aug 2015 18:44:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   mm/Kconfig

Also
  mm/Makefile

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