lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090115010141.42e1dfc5.sfr@canb.auug.org.au>
Date:	Thu, 15 Jan 2009 01:01:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Catalin Marinas <catalin.marinas@....com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 00/14] Kernel memory leak detector

Hi Catalin,

On Wed, 14 Jan 2009 12:30:20 +0000 Catalin Marinas <catalin.marinas@....com> wrote:
>
> I updated the git://linux-arm.org/linux-2.6.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?
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ