Re: [PATCH 0/5] OOM analysis helper patch series v2

[KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>]

> On Thu, 9 Jul 2009, Li, Ming Chun wrote:
> 
> I am applying the patch series to 2.6.31-rc2.

hm, maybe I worked on a bit old tree. I will check latest linus tree again
today.

thanks.


> > ---------------
> > /usr/src/linux-2.6# git checkout experimental
> > Switched to branch "experimental"
> > 
> > /usr/src/linux-2.6# git am ./patches/km1.patch
> > Applying add per-zone statistics to show_free_areas()
> > 
> > /usr/src/linux-2.6# git am ./patches/km2.patch
> > Applying add buffer cache information to show_free_areas()
> > error: patch failed: mm/page_alloc.c:2118
> > error: mm/page_alloc.c: patch does not apply
> > Patch failed at 0002.
> > When you have resolved this problem run "git-am --resolved".
> > If you would prefer to skip this patch, instead run "git-am --skip".
> > 
> > /usr/src/linux-2.6# git am ./patches/km3.patch
> > previous dotest directory .dotest still exists but mbox given.
> > 
> > /usr/src/linux-2.6# rm -rf .dotest/
> > 
> > /usr/src/linux-2.6# git am ./patches/km3.patch
> > Applying Show kernel stack usage to /proc/meminfo and OOM log
> > 
> > /usr/src/linux-2.6# git am ./patches/km4.patch
> > Applying add isolate pages vmstat
> > error: patch failed: mm/page_alloc.c:2115
> > error: mm/page_alloc.c: patch does not apply
> > Patch failed at 0002.
> > When you have resolved this problem run "git-am --resolved".
> > If you would prefer to skip this patch, instead run "git-am --skip".
> > 
> > /usr/src/linux-2.6# git am ./patches/km5.patch
> > previous dotest directory .dotest still exists but mbox given.
> > 
> > /usr/src/linux-2.6# rm -rf .dotest/
> > 
> > /usr/src/linux-2.6# git am ./patches/km5.patch
> > Applying add shmem vmstat
> > error: patch failed: include/linux/mmzone.h:102
> > error: include/linux/mmzone.h: patch does not apply
> > error: patch failed: mm/vmstat.c:646
> > error: mm/vmstat.c: patch does not apply
> > error: patch failed: mm/page_alloc.c:2120
> > error: mm/page_alloc.c: patch does not apply
> > Patch failed at 0002.
> > When you have resolved this problem run "git-am --resolved".
> > If you would prefer to skip this patch, instead run "git-am --skip".
> > ------------
> > 
> > Is there any better way that you could recommend to me to apply your 
> > patches cleanly? Thanks.
> > 
> > 
> 
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org.  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>



--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>