Re: linux-next: manual merge of the kmemleak tree with Linus' tree
Hi Catalin, On Fri, 12 Oct 2012 16:22:06 +0100 Catalin Marinas 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 Rothwells...@canb.auug.org.au pgpdPeetnvAgV.pgp Description: PGP signature
Re: linux-next: manual merge of the kmemleak tree with Linus' tree
Hi Catalin, On Fri, 12 Oct 2012 16:22:06 +0100 Catalin Marinas catalin.mari...@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 Rothwells...@canb.auug.org.au pgpdPeetnvAgV.pgp Description: PGP signature
Re: linux-next: manual merge of the kmemleak tree with Linus' tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the kmemleak tree with Linus' tree
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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the kmemleak tree with Linus' tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the kmemleak tree with Linus' tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the kmemleak tree with Linus' tree
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 Rothwells...@canb.auug.org.au
pgp9Oyu22PEGy.pgp
Description: PGP signature
linux-next: manual merge of the kmemleak tree with Linus' tree
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 Rothwells...@canb.auug.org.au pgp9Oyu22PEGy.pgp Description: PGP signature
Re: linux-next: manual merge of the kmemleak tree with Linus' tree
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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the kmemleak tree with Linus' tree
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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
