Merge "mm: fix __GFP_BITS_MASK"

#define ___GFP_ACCOUNT		0x100000u

#define ___GFP_DIRECT_RECLAIM	0x200000u

#define ___GFP_KSWAPD_RECLAIM	0x400000u

#define ___GFP_CMA		0x800000u

#ifdef CONFIG_LOCKDEP

#define ___GFP_NOLOCKDEP	0x1000000u

#define ___GFP_NOLOCKDEP	0x800000u

#else

#define ___GFP_NOLOCKDEP	0

#endif

#define ___GFP_CMA		0x1000000u

/* If the above are modified, __GFP_BITS_SHIFT may need updating */

/*