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 for Android: free password hash cracker in your pocket

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

Message-Id: <20120518160231.8ba3d6157cbbc6d8a92280a6@canb.auug.org.au>
Date:	Fri, 18 May 2012 16:02:31 +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,
	David Mackey <tdmackey@...tter.com>,
	Vinson Lee <vlee@...tter.com>, Jiri Kosina <jkosina@...e.cz>
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_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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped