Messages in this thread | | | Date | Thu, 23 Oct 2014 15:06:31 +0200 | From | Michal Hocko <> | Subject | Re: linux-next: manual merge of the akpm-current tree with the pm tree |
| |
On Thu 23-10-14 14:09:05, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between > commit 5695be142e20 ("OOM, PM: OOM killed task shouldn't escape PM > suspend") from the pm tree and commit e039ae202d34 ("OOM, PM: OOM > killed task cannot escape PM suspend") from the akpm-current tree. > > I fixed it up (the pm tree version seems to be newer, so I used that) > and can carry the fix as necessary (no action is required).
Yes that is correct. I thought Andrew has dropped the previous version of the patch from his tree. Rafael has merged his in the meantime.
Thanks! -- Michal Hocko SUSE Labs
| |