From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Van Hensbergen Subject: Re: linux-next: Tree for Sept 21 Date: Wed, 30 Nov 2011 15:02:58 -0600 Message-ID: References: <20110921155850.09c858bb38205bb2cc0c8f0a@canb.auug.org.au> <20110922002235.53ae8ed70b92d9d325a79a62@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:52243 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752324Ab1K3VDU convert rfc822-to-8bit (ORCPT ); Wed, 30 Nov 2011 16:03:20 -0500 In-Reply-To: <20110922002235.53ae8ed70b92d9d325a79a62@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: LKML , linux-next@vger.kernel.org On Wed, Sep 21, 2011 at 9:22 AM, Stephen Rothwell wrote: > Hi Eric, > > On Wed, 21 Sep 2011 09:10:31 -0500 Eric Van Hensbergen wrote: >> >> You can switch the v9fs tree to pull from the for-next branch of >> github.com:ericvh/linux.git until kernel.org gets back. =A0Hopefully >> that will resolve the reported merge conflict. > > OK, I will switch to this tree from tomorrow - assuming that the real > Eric does't complain :-). > v9fs tree for-next branch is back on kernel.org: git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git for-next Thanks, -eric