From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Michel Lespinasse <walken@google.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the kmemleak tree with Linus' tree
Date: Tue, 9 Oct 2012 21:52:25 -0700 [thread overview]
Message-ID: <20121010045225.GA3975@swordfish> (raw)
In-Reply-To: <20121010140644.0235454126ca50b7f60d1f59@canb.auug.org.au>
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
next prev parent reply other threads:[~2012-10-10 4:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-10-10 4:55 ` Sergey Senozhatsky
2012-10-12 15:22 ` Catalin Marinas
2012-10-15 23:09 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121010045225.GA3975@swordfish \
--to=sergey.senozhatsky@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=walken@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.