Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756887AbYHMTKz (ORCPT ); Wed, 13 Aug 2008 15:10:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752289AbYHMTKr (ORCPT ); Wed, 13 Aug 2008 15:10:47 -0400 Received: from mx1.redhat.com ([66.187.233.31]:53275 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752003AbYHMTKr (ORCPT ); Wed, 13 Aug 2008 15:10:47 -0400 Date: Wed, 13 Aug 2008 14:02:20 -0500 From: David Teigland To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Andrew Morton Subject: [GIT PULL] dlm fixes for 2.6.27-rc3 Message-ID: <20080813190220.GC24628@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1380 Lines: 43 Linus, Please pull two simple dlm fixes from: git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git for-linus Thanks, Dave fs/dlm/config.c | 203 +++++++++++++++++++++++++++++-------------------------- fs/dlm/user.c | 10 ++- 2 files changed, 114 insertions(+), 99 deletions(-) commit 51409340d240dabe66adb49f645588c3a802d055 Author: David Teigland Date: Thu Jul 31 09:31:53 2008 -0500 dlm: rename structs Add a dlm_ prefix to the struct names in config.c. This resolves a conflict with struct node in particular, when include/linux/node.h happens to be included. Reported-by: Andrew Morton Signed-off-by: David Teigland commit cb980d9a3ec3d39e30e0a4c473df528c09e0dcf3 Author: David Teigland Date: Tue Jul 29 15:21:19 2008 -0500 dlm: add missing kfrees A couple of unlikely error conditions were missing a kfree on the error exit path. Reported-by: Juha Leppanen Signed-off-by: David Teigland -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/