Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751073AbWAEAww (ORCPT ); Wed, 4 Jan 2006 19:52:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751033AbWAEAvG (ORCPT ); Wed, 4 Jan 2006 19:51:06 -0500 Received: from smtp.osdl.org ([65.172.181.4]:44515 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1751009AbWAEAvB (ORCPT ); Wed, 4 Jan 2006 19:51:01 -0500 Date: Wed, 4 Jan 2006 16:50:49 -0800 (PST) From: Linus Torvalds To: Zach Brown cc: Andrew Morton , Joel Becker , Arjan van de Ven , Christoph Hellwig , Wim Coekaerts , Mark Fasheh , Linux Kernel Mailing List Subject: Re: merging ocfs2? In-Reply-To: <43BAF93A.10509@oracle.com> Message-ID: References: <43BAF93A.10509@oracle.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 753 Lines: 24 On Tue, 3 Jan 2006, Zach Brown wrote: > > Joel has done the heavy lifting to bring its git repository up to date > so one should be able to pull from: > > http://oss.oracle.com/git/ocfs2.git If Christoph is happy with it, and there has been no grumbling from -mm, I can certainly merge it. However, I really _really_ prefer that people who use git to merge use the native git protocol, which I trust. That http: thing may work, but it's a cludge ;) Can you run git-daemon on the machine? Linus - 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/