linux-kernel - Re: linux-next: manual merge of the hwpoison tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20101008061106.GB13352@basil.fritz.box>
Date:	Fri, 8 Oct 2010 08:11:07 +0200
From:	Andi Kleen <andi@...stfloor.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andi Kleen <andi@...stfloor.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the hwpoison tree with Linus' tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/