[lkml]   [2009]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: [PATCH 00/14] Kernel memory leak detector
Hi Catalin,

On Wed, 14 Jan 2009 12:30:20 +0000 Catalin Marinas <> wrote:
> I updated the git:// kmemleak branch to the
> latest mainline and it works fine. However, I tried to merge it with the
> linux-next tree and there are many conflicts with kmemtrace as they both
> modify similar areas of the kernel. The conflicts are relatively simple
> but they still need manual fixing.

I just did a test merge with today's linux-next and though thee are a few
conflicts, it is not to much for me to handle - I have had worse :-)

> Are you OK with applying patches to linux-next (git am) rather than
> using git merge? This way I can rebase kmemleak on top of linux-next.

I would much prefer a few conflicts to carrying a post linux-next patch
because linux-next can change radically day to day - especially since we
know there will be clashes in the areas of files you would be patching.

So lets use the above git tree and see how we go. OK?
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2009-01-14 15:05    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean