linux-kernel - linux-next: manual merge of the trivial tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Date:	Fri, 29 Jun 2012 14:36:07 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wanpeng Li <liwp@...ux.vnet.ibm.com>,
	Hugh Dickins <hughd@...gle.com>,
	Konstantin Khlebnikov <khlebnikov@...nvz.org>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the trivial tree with Linus' tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
include/linux/mmzone.h between commit 89abfab133ef ("mm/memcg: move
reclaim_stat into lruvec") from Linus' tree and commit 46028e6d10cb ("mm:
cleanup on the comments of zone_reclaim_stat") from the trivial tree.

The former moved the code that was updated by the latter.  I applied the
latter to the new position (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/mmzone.h
index 2427706,5463177..0000000
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@@ -185,25 -185,8 +185,25 @@@ static inline int is_unevictable_lru(en
  	return (lru == LRU_UNEVICTABLE);
  }
  
 +struct zone_reclaim_stat {
 +	/*
 +	 * The pageout code in vmscan.c keeps track of how many of the
- 	 * mem/swap backed and file backed pages are refeferenced.
++	 * mem/swap backed and file backed pages are referenced.
 +	 * The higher the rotated/scanned ratio, the more valuable
 +	 * that cache is.
 +	 *
 +	 * The anon LRU stats live in [0], file LRU stats in [1]
 +	 */
 +	unsigned long		recent_rotated[2];
 +	unsigned long		recent_scanned[2];
 +};
 +
  struct lruvec {
  	struct list_head lists[NR_LRU_LISTS];
 +	struct zone_reclaim_stat reclaim_stat;
 +#ifdef CONFIG_CGROUP_MEM_RES_CTLR
 +	struct zone *zone;
 +#endif
  };
  
  /* Mask used at gathering information at once (see memcontrol.c) */

Content of type "application/pgp-signature" skipped