* linux-next: manual merge of the kmemleak tree with Linus' tree
@ 2012-10-10 3:06 Stephen Rothwell
2012-10-10 4:52 ` Sergey Senozhatsky
2012-10-10 4:55 ` Sergey Senozhatsky
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2012-10-10 3:06 UTC (permalink / raw)
To: Catalin Marinas
Cc: linux-next, linux-kernel, Sergey Senozhatsky, Michel Lespinasse,
Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
mm/kmemleak.c between commit 85d3a316c714 ("kmemleak: use rbtree instead
of prio tree") from Linus' tree and commit 48786770bf3b ("kmemleak: do
not leak object after tree insertion error") from the kmemleak tree.
The kmemleak tree commit has been there since April, should it have
progressed by now? Its fix is also included in the above commit from
Linus' tree.
I just used the version from Linus' tree and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the kmemleak tree with Linus' tree
2012-10-10 3:06 linux-next: manual merge of the kmemleak tree with Linus' tree Stephen Rothwell
@ 2012-10-10 4:52 ` Sergey Senozhatsky
2012-10-10 4:55 ` Sergey Senozhatsky
1 sibling, 0 replies; 5+ messages in thread
From: Sergey Senozhatsky @ 2012-10-10 4:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Catalin Marinas, linux-next, linux-kernel, Michel Lespinasse,
Andrew Morton
On (10/10/12 14:06), Stephen Rothwell wrote:
> Hi Catalin,
>
> Today's linux-next merge of the kmemleak tree got a conflict in
> mm/kmemleak.c between commit 85d3a316c714 ("kmemleak: use rbtree instead
> of prio tree") from Linus' tree and commit 48786770bf3b ("kmemleak: do
> not leak object after tree insertion error") from the kmemleak tree.
>
> The kmemleak tree commit has been there since April, should it have
> progressed by now? Its fix is also included in the above commit from
> Linus' tree.
>
> I just used the version from Linus' tree and can carry the fix as
> necessary (no action is required).
>
Hello,
I can re-base my patch (I thought it's already in Linus' tree).
-ss
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the kmemleak tree with Linus' tree
2012-10-10 3:06 linux-next: manual merge of the kmemleak tree with Linus' tree Stephen Rothwell
2012-10-10 4:52 ` Sergey Senozhatsky
@ 2012-10-10 4:55 ` Sergey Senozhatsky
2012-10-12 15:22 ` Catalin Marinas
1 sibling, 1 reply; 5+ messages in thread
From: Sergey Senozhatsky @ 2012-10-10 4:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Catalin Marinas, linux-next, linux-kernel, Michel Lespinasse,
Andrew Morton
On (10/10/12 14:06), Stephen Rothwell wrote:
> Hi Catalin,
>
> Today's linux-next merge of the kmemleak tree got a conflict in
> mm/kmemleak.c between commit 85d3a316c714 ("kmemleak: use rbtree instead
> of prio tree") from Linus' tree and commit 48786770bf3b ("kmemleak: do
> not leak object after tree insertion error") from the kmemleak tree.
>
> The kmemleak tree commit has been there since April, should it have
> progressed by now? Its fix is also included in the above commit from
> Linus' tree.
>
> I just used the version from Linus' tree and can carry the fix as
> necessary (no action is required).
>
Oh, my bad! Just took a look on current create_object(). I guess we can
drop my patch.
-ss
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the kmemleak tree with Linus' tree
2012-10-10 4:55 ` Sergey Senozhatsky
@ 2012-10-12 15:22 ` Catalin Marinas
2012-10-15 23:09 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Catalin Marinas @ 2012-10-12 15:22 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Michel Lespinasse, Andrew Morton
On Wed, Oct 10, 2012 at 05:55:53AM +0100, Sergey Senozhatsky wrote:
> On (10/10/12 14:06), Stephen Rothwell wrote:
> > Today's linux-next merge of the kmemleak tree got a conflict in
> > mm/kmemleak.c between commit 85d3a316c714 ("kmemleak: use rbtree instead
> > of prio tree") from Linus' tree and commit 48786770bf3b ("kmemleak: do
> > not leak object after tree insertion error") from the kmemleak tree.
> >
> > The kmemleak tree commit has been there since April, should it have
> > progressed by now? Its fix is also included in the above commit from
> > Linus' tree.
> >
> > I just used the version from Linus' tree and can carry the fix as
> > necessary (no action is required).
>
> Oh, my bad! Just took a look on current create_object(). I guess we can
> drop my patch.
Sorry, I haven't pushed it early enough and I've seen the rbtree
conversion patch in the meantime which was fixing this as well.
I've updated my kmemleak branch now. Stephen, I guess you can remove
this branch since I don't have any outstanding kmemleak patches.
Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the kmemleak tree with Linus' tree
2012-10-12 15:22 ` Catalin Marinas
@ 2012-10-15 23:09 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2012-10-15 23:09 UTC (permalink / raw)
To: Catalin Marinas
Cc: Sergey Senozhatsky, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Michel Lespinasse, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
Hi Catalin,
On Fri, 12 Oct 2012 16:22:06 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> I've updated my kmemleak branch now. Stephen, I guess you can remove
> this branch since I don't have any outstanding kmemleak patches.
Done. Let me know if you get enthused about it again :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-10-15 23:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-10 3:06 linux-next: manual merge of the kmemleak tree with Linus' tree Stephen Rothwell
2012-10-10 4:52 ` Sergey Senozhatsky
2012-10-10 4:55 ` Sergey Senozhatsky
2012-10-12 15:22 ` Catalin Marinas
2012-10-15 23:09 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox