From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: with ECARTIS (v1.0.0; list xfs); Sun, 10 Feb 2008 20:57:16 -0800 (PST) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.168.28]) by oss.sgi.com (8.12.11.20060308/8.12.11/SuSE Linux 0.7) with ESMTP id m1B4vAf0015451 for ; Sun, 10 Feb 2008 20:57:13 -0800 Received: from sandeen.net (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id 67BA8DDB1F5 for ; Sun, 10 Feb 2008 20:57:33 -0800 (PST) Received: from sandeen.net (sandeen.net [209.173.210.139]) by cuda.sgi.com with ESMTP id Va0NZoPHaFFEdzWC for ; Sun, 10 Feb 2008 20:57:33 -0800 (PST) Message-ID: <47AFD5BB.7090607@sandeen.net> Date: Sun, 10 Feb 2008 22:57:31 -0600 From: Eric Sandeen MIME-Version: 1.0 Subject: Re: [GIT PULL] XFS update for 2.6.25 References: <20080208022705.0DB1058C4C11@chook.melbourne.sgi.com> <47AD284F.7080603@sandeen.net> <47AFD5B5.7040506@sgi.com> In-Reply-To: <47AFD5B5.7040506@sgi.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: xfs-bounce@oss.sgi.com Errors-to: xfs-bounce@oss.sgi.com List-Id: xfs To: lachlan@sgi.com Cc: xfs@oss.sgi.com Lachlan McIlroy wrote: > Eric, > > The other makefile changes caused a merge failure because of changes we > keep in our development tree that are not in mainline. I didn't have > time to fix them for rc1 so I'll get them out in rc2. I know the changes > are good and very useful so sorry for the delay. > > Lachlan Thanks Lachlan, no worries. Hopefully the patches I sent will help. -Eric