From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755364AbZHEFJq (ORCPT ); Wed, 5 Aug 2009 01:09:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754144AbZHEFJo (ORCPT ); Wed, 5 Aug 2009 01:09:44 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:39505 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754019AbZHEFJo (ORCPT ); Wed, 5 Aug 2009 01:09:44 -0400 Date: Wed, 5 Aug 2009 15:09:33 +1000 From: Stephen Rothwell To: Borislav Petkov Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Doug Thompson Subject: linux-next: manual merge of the edac-amd tree with Linus' tree Message-Id: <20090805150933.103de233.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.5; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__5_Aug_2009_15_09_33_+1000_rP47wccz9lCjEdPF" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Wed__5_Aug_2009_15_09_33_+1000_rP47wccz9lCjEdPF Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Borislav, Today's linux-next merge of the edac-amd tree got a conflict in drivers/edac/amd64_edac.c between commit 126b67b8d26f6623d199aa59279f2e3243f2144c ("amd64_edac: fix ECC checking") from Linus' tree and commit 793a2a12b43aba669c8b2604a45f000a394f142d ("amd64_edac: cleanup amd64_check_ecc_enabled") from the edac-amd tree. I don't think the fix in the former patch is required, so I just used the latter version. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__5_Aug_2009_15_09_33_+1000_rP47wccz9lCjEdPF Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkp5FA0ACgkQjjKRsyhoI8yOeQCghBzQsv/bM+tSZ+XDDBLjlkHS u48AnjD+nddDgs6uMVnrl8X7rt9dmmP7 =zs9O -----END PGP SIGNATURE----- --Signature=_Wed__5_Aug_2009_15_09_33_+1000_rP47wccz9lCjEdPF--