X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.4.0-r929098 Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id q0UIRJpo094108; Mon, 30 Jan 2012 12:27:19 -0600 Received: from whiskey.americas.sgi.com (whiskey.americas.sgi.com [128.162.233.19]) by relay1.corp.sgi.com (Postfix) with ESMTP id AAE888F8054; Mon, 30 Jan 2012 10:27:13 -0800 (PST) Received: by whiskey.americas.sgi.com (Postfix, from userid 4600) id 5F96E426DA7; Mon, 30 Jan 2012 12:27:17 -0600 (CST) Date: Mon, 30 Jan 2012 12:27:17 -0600 From: Ben Myers To: Stephen Rothwell Cc: xfs-masters@oss.sgi.com, linux-next@vger.kernel.org, xfs@oss.sgi.com Subject: Re: XFS for-next branch Message-ID: <20120130182717.GE7762@sgi.com> References: <20120125171244.GX8262@sgi.com> <20120127110533.10304c6a33b83ac8e778915c@canb.auug.org.au> <20120127160137.GJ8262@sgi.com> <20120128081709.e7b0df733e5d35fe625eeea0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120128081709.e7b0df733e5d35fe625eeea0@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Hi Stephen, On Sat, Jan 28, 2012 at 08:17:09AM +1100, Stephen Rothwell wrote: > On Fri, 27 Jan 2012 10:01:37 -0600 Ben Myers wrote: > > > > On Fri, Jan 27, 2012 at 11:05:33AM +1100, Stephen Rothwell wrote: > > > On Wed, 25 Jan 2012 11:12:44 -0600 Ben Myers wrote: > > > > > > > > Could you pull XFS updates from > > > > > > > > git://oss.sgi.com/xfs/xfs.git for-next > > > > > > > > instead of from the oss/master branch for 3.3? > > > > > > OK, currently I fetch the "master" branch of that tree. And you want em > > > to switch to the "for-next" branch, right? (Those two branches currently > > > point to the same commit, so I have not changed yet.) > > > > Yep, please switch to oss/for-next instead of oss/master. I'll keep > > them in sync normally, it's just that I'd like to have a little > > flexability WRT what is in for-next. > > Just to be crystal clear: there are no branches in that tree called > "oss/for-next" or "oss/master" - I assume that you are referring to the > branches called "for-next" and "master", right? I am referring to for-next and master branches, at git://oss.sgi.com/xfs/xfs.git. Sorry I wasn't very clear. Thanks, Ben