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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 18 Aug 2015 18:44:48 +1000

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                    [email-masked]

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.