From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andi Kleen Subject: Re: linux-next: manual merge of the hwpoison tree with Linus' tree Date: Fri, 8 Oct 2010 08:11:07 +0200 Message-ID: <20101008061106.GB13352@basil.fritz.box> References: <20101008144037.f487b6d7.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from one.firstfloor.org ([213.235.205.2]:40736 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751628Ab0JHGLL (ORCPT ); Fri, 8 Oct 2010 02:11:11 -0400 Content-Disposition: inline In-Reply-To: <20101008144037.f487b6d7.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Andi Kleen , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org 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