From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jim Keniston <jkenisto@us.ibm.com>,
Oleg Nesterov <oleg@redhat.com>
Subject: Re: linux-next: manual merge of the uprobes tree with Linus' tree
Date: Tue, 28 Feb 2012 11:04:42 +0530 [thread overview]
Message-ID: <20120228053442.GB32211@linux.vnet.ibm.com> (raw)
In-Reply-To: <20120228134319.033a60df8db2925d91604c18@canb.auug.org.au>
Hi Stephen,
> Today's linux-next merge of the uprobes tree got a conflict in
> kernel/fork.c between commit d80e731ecab4 ("epoll: introduce POLLFREE to
> flush ->signalfd_wqh before kfree()") from Linus' tree and commit
> 1f9eb65410a6 ("uprobes/core: handle breakpoint and signal step
> exception") from the uprobes tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Okay, Thanks for letting me know.
I will fix this up accordingly.
prev parent reply other threads:[~2012-02-28 5:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 2:43 linux-next: manual merge of the uprobes tree with Linus' tree Stephen Rothwell
2012-02-28 5:34 ` Srikar Dronamraju [this message]
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=20120228053442.GB32211@linux.vnet.ibm.com \
--to=srikar@linux.vnet.ibm.com \
--cc=jkenisto@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).