Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982Ab2HBQdU (ORCPT ); Thu, 2 Aug 2012 12:33:20 -0400 Received: from cobra.newdream.net ([66.33.216.30]:38710 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752399Ab2HBQdS (ORCPT ); Thu, 2 Aug 2012 12:33:18 -0400 Date: Thu, 2 Aug 2012 09:33:18 -0700 (PDT) From: Sage Weil X-X-Sender: sage@cobra.newdream.net To: torvalds@linux-foundation.org cc: linux-kernel@vger.kernel.org, ceph-devel@vger.kernel.org Subject: [GIT PULL] Final ceph bits for 3.6 Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1046 Lines: 31 Hi Linus, Please pull these last two patches from git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git for-linus The first patch fixes up the old crufty open intent code to use the atomic_open stuff properly, and the second fixes a possible null deref and memory leak with the crypto keys. Thanks! sage ---------------------------------------------------------------- Sage Weil (1): ceph: simplify+fix atomic_open Sylvain Munaut (1): libceph: fix crypto key null deref, memory leak fs/ceph/dir.c | 38 -------------------------------- fs/ceph/file.c | 62 ++++++++++++++++++++++++++++++++--------------------- fs/ceph/super.h | 6 +++--- net/ceph/crypto.c | 1 + net/ceph/crypto.h | 3 ++- 5 files changed, 43 insertions(+), 67 deletions(-) -- 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/