Messages in this thread | | | Date | Tue, 11 Dec 2012 11:58:03 +0400 | From | Glauber Costa <> | Subject | Re: linux-next: manual merge of the akpm tree with Linus' tree |
| |
On 12/11/2012 09:22 AM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > include/linux/gfp.h between commit caf491916b1c ("Revert "revert "Revert > "mm: remove __GFP_NO_KSWAPD""" and associated damage") from Linus' tree > and commit "mm: add a __GFP_KMEMCG flag" from the akpm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Fix is fine, thanks.
| |