linux-kernel - Re: linux-next: manual merge of the edac tree with the trivial 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1205221055340.16396@pobox.suse.cz>
Date:	Tue, 22 May 2012 10:55:54 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Mauro Carvalho Chehab <mchehab@...hat.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Mackey <tdmackey@...tter.com>,
	Vinson Lee <vlee@...tter.com>
Subject: Re: linux-next: manual merge of the edac tree with the trivial
 tree

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.

-- 
Jiri Kosina
SUSE Labs
--
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/