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

Message-Id: <20120924152757.eee2b749725e6bc08f7e7d4f@canb.auug.org.au>
Date:	Mon, 24 Sep 2012 15:27:57 +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,
	Shaun Ruffell <sruffell@...ium.com>
Subject: linux-next: manual merge of the edac tree with Linus' tree

Hi Mauro,

Today's linux-next merge of the edac tree got a conflict in drivers/edac/edac_mc.c between commit faa2ad09c01c ("edac_mc: edac_mc_free() cannot assume mem_ctl_info is registered in sysfs") from Linus' tree and commit 12c3ab9422cc ("edac: edac_mc_free() cannot assume mem_ctl_info is registered in sysfs") from the edac tree.

Two versions of the same patch. I just used the version from the edac
tree and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped