From: Andi Kleen <andi@firstfloor•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andi Kleen <andi@firstfloor•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the hwpoison tree with Linus' tree
Date: Fri, 8 Oct 2010 08:11:07 +0200 [thread overview]
Message-ID: <20101008061106.GB13352@basil.fritz.box> (raw)
In-Reply-To: <20101008144037.f487b6d7.sfr@canb.auug.org.au>
On Fri, Oct 08, 2010 at 02:40:37PM +1100, Stephen Rothwell wrote:
> Hi Andi,
>
> Today's linux-next merge of the hwpoison tree got a conflict in
> mm/memory-failure.c between commit
> 0d9ee6a2d4a6e92c49e6fa9469e5731d21ee203e ("HWPOISON: Report correct
> address granuality for AO huge page errors") from Linus' tree and commit
> 3c5ca5455796841ac3cd706a91ba8dada908c375 ("HWPOISON: Report correct
> address granuality for AO huge page errors") from the hwpoison tree.
>
> Slightly different versions of the same patch. I used the version from
Yes I did a rebase here.
> Linus' tree (since it was committed later). The conflict looked like this:
I will rebase the tree. Thanks for catching.
-Andi
next prev parent reply other threads:[~2010-10-08 6:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-08 3:40 linux-next: manual merge of the hwpoison tree with Linus' tree Stephen Rothwell
2010-10-08 6:11 ` Andi Kleen [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-12-16 5:21 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=20101008061106.GB13352@basil.fritz.box \
--to=andi@firstfloor$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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