[Top] [All Lists]

Re: [GIT PULL] XFS update for 2.6.25

To: Eric Sandeen <sandeen@xxxxxxxxxxx>
Subject: Re: [GIT PULL] XFS update for 2.6.25
From: Lachlan McIlroy <lachlan@xxxxxxx>
Date: Mon, 11 Feb 2008 15:57:25 +1100
Cc: xfs@xxxxxxxxxxx
In-reply-to: <47AD284F.7080603@xxxxxxxxxxx>
References: <20080208022705.0DB1058C4C11@xxxxxxxxxxxxxxxxxxxxxxx> <47AD284F.7080603@xxxxxxxxxxx>
Reply-to: lachlan@xxxxxxx
Sender: xfs-bounce@xxxxxxxxxxx
User-agent: Thunderbird (X11/20071031)

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.


Eric Sandeen wrote:
Lachlan McIlroy wrote:
Please pull from the for-linus branch:
    git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus

This will update the following files:

 fs/xfs/Makefile-linux-2.6      |    1 -

Is there a reason the other various makefile updates still haven't been
pushed?  They're a lot tidier now, and they facilitate out-of-tree


Remove Makefile wrappers in XFS

Makefile (and Kbuild) would include Makefile-linux-26
I doubt XFS will really still compile on 2.4; so drop that. This
moves Makefile-linux-26 into Makefile and drops Kbuild.
Also having wrappers as both Kbuild and Makefile seemed redundant

The patch is relatively large because it renames a file, but
no functional changes.

Signed-off-by: Andi Kleen <ak@xxxxxxx>
Merge of xfs-linux-melb:xfs-kern:29781a by kenmcd.

  Remove Makefile wrappers in XFS.

Fix up xfs out-of-tree builds. (a.k.a. external modules)

Change -I include directives to find headers in the out-of-tree spot.
This allows a directory containing only xfs files to be built as:

  # make -C /path/to/kernel M=`pwd`

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
Merge of xfs-linux-melb:xfs-kern:29878a by kenmcd.

  fix up out-of-tree xfs builds.

<Prev in Thread] Current Thread [Next in Thread>