linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20120518160603.0eddece830f829d3b8570ac7@canb.auug.org.au>
Date:	Fri, 18 May 2012 16:06:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Kosina <jkosina@...e.cz>,
	David Mackey <tdmackey@...tter.com>
Subject: linux-next: manual merge of the edac tree with the trivial tree

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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped