From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michael Neuling <mikey@neuling.org>,
linux-kernel@vger.kernel.org, Oleg Nesterov <oleg@redhat.com>,
linux-next@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the akpm tree with the powerpc tree
Date: Wed, 26 Jun 2013 18:10:31 +1000 [thread overview]
Message-ID: <1372234231.18612.6.camel@pasglop> (raw)
In-Reply-To: <20130626165642.8740ecb6d5d5882b06f173c8@canb.auug.org.au>
On Wed, 2013-06-26 at 16:56 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm tree got a conflict in
> arch/powerpc/kernel/ptrace.c between commit b0b0aa9c7faf
> ("powerpc/hw_brk: Fix setting of length for exact mode breakpoints") from
> the powerpc tree and commit "ptrace/powerpc: revert "hw_breakpoints: Fix
> racy access to ptrace breakpoints"" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Where does the latter come from ? Why didn't it go through the powerpc tree ?
Cheers,
Ben.
next prev parent reply other threads:[~2013-06-26 8:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-26 6:56 linux-next: manual merge of the akpm tree with the powerpc tree Stephen Rothwell
2013-06-26 8:10 ` Benjamin Herrenschmidt [this message]
2013-06-26 13:13 ` Andrew Morton
2013-06-26 14:19 ` Oleg Nesterov
2013-06-26 21:56 ` Benjamin Herrenschmidt
-- strict thread matches above, loose matches on Subject: below --
2021-06-28 9:56 Stephen Rothwell
2020-03-06 6:39 Stephen Rothwell
2020-03-06 5:29 Stephen Rothwell
2016-11-15 3:52 Stephen Rothwell
2016-08-02 3:39 Stephen Rothwell
2012-03-13 9:10 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=1372234231.18612.6.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.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).