login
Login / Register
Header Space

 
 

Home » Mailing list archives » linux-kernel » 2008 » February » 18

Re: [GIT PULL] XFS update for 2.6.25-rc3

Previous thread: [PATCH 3/3] memcgroup: return negative error code in mem_cgroup_create() by Li Zefan on Monday, February 18, 2008 - 1:59 am. (2 messages)

Next thread: [PATCH 1/2] bluetooth : put hci dev after del conn by Dave Young on Monday, February 18, 2008 - 3:55 am. (3 messages)
[view original message]
From: Lachlan McIlroy <lachlan@...>
To: <torvalds@...>
Cc: <linux-kernel@...>, <xfs@...>, <akpm@...>
Subject: [GIT PULL] XFS update for 2.6.25-rc3
Date: Monday, February 18, 2008 - 2:27 am

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/Kbuild             |    6 --
 fs/xfs/Makefile           |  118 ++++++++++++++++++++++++++++++++++++++++++++-
 fs/xfs/Makefile-linux-2.6 |  117 --------------------------------------------
 3 files changed, 117 insertions(+), 124 deletions(-)
 delete mode 100644 fs/xfs/Kbuild

through these commits:

commit 269cdfaf769f5cd831284cc831790c7c5038040f
Author: Lachlan McIlroy &lt;lachlan@redback.melbourne.sgi.com&gt;
Date:   Wed Nov 28 18:28:09 2007 +1100

    [XFS] Added quota targets and removed dmapi directory
    
    Fixes build failures introduced by bad merge to mainline.

commit 794f744b225aaf35742aac9e7b9dda96a9943413
Author: Eric Sandeen &lt;sandeen@sandeen.net&gt;
Date:   Tue Nov 27 16:59:56 2007 +1100

    [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:
    
    SGI-PV: 971186
    SGI-Modid: xfs-linux-melb:xfs-kern:29878a
    
    Signed-off-by: Eric Sandeen &lt;sandeen@sandeen.net&gt;
    Signed-off-by: Donald Douwsma &lt;donaldd@sgi.com&gt;
    Signed-off-by: Lachlan McIlroy &lt;lachlan@sgi.com&gt;

commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2
Author: Andi Kleen &lt;ak@suse.de&gt;
Date:   Tue Nov 27 16:53:47 2007 +1100

    [XFS] 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 anyways.
    
    The patch is relatively large because it renames a file, but no functional
    changes.
    
    SGI-PV: 971050
    SGI-Modid: xfs-linux-melb:xfs-kern:29781a
    
    Signed-off-by: Andi Kleen &lt;ak@suse.de&gt...
[ message continues ]
[view original message]
From: Linus Torvalds <torvalds@...>
To: Lachlan McIlroy <lachlan@...>
Cc: <linux-kernel@...>, <xfs@...>, <akpm@...>
Subject: Re: [GIT PULL] XFS update for 2.6.25-rc3
Date: Monday, February 18, 2008 - 7:49 pm

Hmm. This didn't actually remove the old Makefile-linux-2.6 file, so it 
exists as a zero-length file still.

Was that intentional?

		Linus
--
[view original message]
From: Lachlan McIlroy <lachlan@...>
To: Linus Torvalds <torvalds@...>
Cc: <linux-kernel@...>, <xfs@...>, <akpm@...>
Subject: Re: [GIT PULL] XFS update for 2.6.25-rc3
Date: Monday, February 18, 2008 - 7:59 pm

No, not intentional, just the result of a merge failure I didn't clean up.
--
Previous thread: [PATCH 3/3] memcgroup: return negative error code in mem_cgroup_create() by Li Zefan on Monday, February 18, 2008 - 1:59 am. (2 messages)

Next thread: [PATCH 1/2] bluetooth : put hci dev after del conn by Dave Young on Monday, February 18, 2008 - 3:55 am. (3 messages)

Mail archive search
Enter your search terms.
Optionally limit your search to a specific mailing list.
advanced
Recent Tags
more tags
Colocation donated by:
Who's online
There are currently 5 users and 1302 guests online.

Online users

Syndicate
Syndicate content
© 2007 KernelTrap.  |  Powered by Drupal.  |  Legal statement.
speck-geostationary