linux-kernel - linux-next: manual merge of the akpm tree with the 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: <20120531135013.a7ac23ab7cbc5c3e71211be0@canb.auug.org.au>
Date:	Thu, 31 May 2012 13:50:13 +1000
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,
	"Kirill A. Shutemov" <kirill@...temov.name>
Subject: linux-next: manual merge of the akpm tree with the  tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/memcontrol.c between commit a0db00fcf5da ("memcg: remove redundant
parentheses") from Linus' tree and commit "memcg: track resource index in
cftype private" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc mm/memcontrol.c
index ffa9490,4ebe680..0000000
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -404,9 -391,14 +404,14 @@@ enum charge_type 
  #define _MEM			(0)
  #define _MEMSWAP		(1)
  #define _OOM_TYPE		(2)
- #define MEMFILE_PRIVATE(x, val)	((x) << 16 | (val))
- #define MEMFILE_TYPE(val)	((val) >> 16 & 0xffff)
- #define MEMFILE_ATTR(val)	((val) & 0xffff)
+ #define _MEMHUGETLB		(3)
+ 
+ /*  0 ... val ...16.... x...24...idx...32*/
 -#define __MEMFILE_PRIVATE(idx, x, val)	(((idx) << 24) | ((x) << 16) | (val))
++#define __MEMFILE_PRIVATE(idx, x, val)	((idx) << 24 | (x) << 16 | (val))
+ #define MEMFILE_PRIVATE(x, val)		__MEMFILE_PRIVATE(0, x, val)
 -#define MEMFILE_TYPE(val)		(((val) >> 16) & 0xff)
 -#define MEMFILE_IDX(val)		(((val) >> 24) & 0xff)
++#define MEMFILE_TYPE(val)		((val) >> 16 & 0xff)
++#define MEMFILE_IDX(val)		((val) >> 24 & 0xff)
+ #define MEMFILE_ATTR(val)		((val) & 0xffff)
  /* Used for OOM nofiier */
  #define OOM_CONTROL		(0)
  

Content of type "application/pgp-signature" skipped