From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757989Ab2EVKaW (ORCPT ); Tue, 22 May 2012 06:30:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33222 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757826Ab2EVKaS (ORCPT ); Tue, 22 May 2012 06:30:18 -0400 Message-ID: <4FBB6A99.4040503@redhat.com> Date: Tue, 22 May 2012 07:29:45 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Jiri Kosina CC: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Mackey , Vinson Lee Subject: Re: linux-next: manual merge of the edac tree with the trivial tree References: <20120518160603.0eddece830f829d3b8570ac7@canb.auug.org.au> In-Reply-To: X-Enigmail-Version: 1.4.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em 22-05-2012 05:55, Jiri Kosina escreveu: > On Fri, 18 May 2012, Stephen Rothwell wrote: > >> Hi Mauro, >> >> Today's linux-next merge of the edac tree got a conflict in >> drivers/edac/edac_core.h between commit 15ed103a9800 ("edac: Fix spelling >> errors") from the trivial tree and commit 90b40d5cadba ("edac: Remove the >> legacy EDAC ABI") from the edac tree. >> >> One of the comments fixed by the former is removed by the latter, so I >> did that. > > On Fri, 18 May 2012, Stephen Rothwell wrote: > >> Hi Mauro, >> >> Today's linux-next merge of the edac tree got a conflict in >> drivers/edac/edac_device.c between commit 15ed103a9800 ("edac: Fix >> spelling errors") from the trivial tree and commit b9e889c84229 ("edac: >> rewrite edac_align_ptr()") from the edac tree. >> >> One of the comments fixed by the former is removed by the latter, so I >> did that. > > I have dropped both hunks, so the conflict should be gone. Thanks. Thanks! Mauro