[GIT PULL] XFS update for 2.6.25-rc3

[GIT PULL] XFS update for 2.6.25-rc3

[Lachlan McIlroy]

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 <lachlan@redback.melbourne.sgi.com>
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 <sandeen@sandeen.net>
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 <sandeen@sandeen.net>
    Signed-off-by: Donald Douwsma <donaldd@sgi.com>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2
Author: Andi Kleen <ak@suse.de>
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 <ak@suse.de>
    Signed-off-by: Donald Douwsma <donaldd@sgi.com>
    Signed-off-by: Tim Shimmin <tes@sgi.com>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

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

[Linus Torvalds]

On Mon, 18 Feb 2008, Lachlan McIlroy wrote:
> 
> 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

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

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

[Lachlan McIlroy]

Linus Torvalds wrote:
> 
> On Mon, 18 Feb 2008, Lachlan McIlroy wrote:
>> 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
> 
> 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?
No, not intentional, just the result of a merge failure I didn't clean up.
It shouldn't cause any problems and I'll delete it in the next batch of changes.

> 
> 		Linus
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

[GIT PULL] XFS update for 2.6.25-rc3

[Lachlan McIlroy]

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 <lachlan@redback.melbourne.sgi.com>
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 <sandeen@sandeen.net>
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 <sandeen@sandeen.net>
    Signed-off-by: Donald Douwsma <donaldd@sgi.com>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2
Author: Andi Kleen <ak@suse.de>
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 <ak@suse.de>
    Signed-off-by: Donald Douwsma <donaldd@sgi.com>
    Signed-off-by: Tim Shimmin <tes@sgi.com>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

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

[Lachlan McIlroy]

please ignore this request - sent the wrong file, see next pull request...

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/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 <lachlan@redback.melbourne.sgi.com>
> 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 <sandeen@sandeen.net>
> 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 <sandeen@sandeen.net>
>     Signed-off-by: Donald Douwsma <donaldd@sgi.com>
>     Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
> 
> commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2
> Author: Andi Kleen <ak@suse.de>
> 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 <ak@suse.de>
>     Signed-off-by: Donald Douwsma <donaldd@sgi.com>
>     Signed-off-by: Tim Shimmin <tes@sgi.com>
>     Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

[GIT PULL] XFS update for 2.6.25-rc3

[Lachlan McIlroy]

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:

 0 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 fs/xfs/Makefile-linux-2.6

through these commits:

commit 6e5e93424dc66542c548dfaa3bfebe30d46d50dd
Author: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date:   Fri Feb 22 15:36:19 2008 +1100

    Remove empty file fs/xfs/Makefile-linux-2.6.

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

[Jeff Garzik]

Lachlan McIlroy wrote:
>     Remove empty file fs/xfs/Makefile-linux-2.6.

Already in the upstream kernel...


> commit 1803f3389b7ac9ed33ea561b3b94e22e2864a95d
> Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
> Date:   Wed Feb 20 19:55:09 2008 -0800
> 
>     Remove empty file remnants that were left in the tree by mistake
>     
>     Noted by various people (Sam, Jeff, Roland..)
>     
>     Commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2 intended to remove the
>     xfs "Makefile-linux-2.6" file, but it was mistakenly still left in the
>     tree as a empty file, and would cause git to correctly complain about a
>     tracked file being removed after a "make distclean" (which removes empty
>     files as garbage).
>     
>     And the asm-x86/desc_64.h file was supposed to be removed by commit
>     c81c6ca45a69478c7877b729af1942d2b80ef582, but instead stayed around
>     containing just a single newline.
>     
>     Get rid of them both properly.
>     
>     Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

[Lachlan McIlroy]

Jeff Garzik wrote:
> Lachlan McIlroy wrote:
>>     Remove empty file fs/xfs/Makefile-linux-2.6.
> 
> Already in the upstream kernel...
That's funny - I didn't see this change come through.  Oh well... thanks.

> 
> 
>> commit 1803f3389b7ac9ed33ea561b3b94e22e2864a95d
>> Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
>> Date:   Wed Feb 20 19:55:09 2008 -0800
>>
>>     Remove empty file remnants that were left in the tree by mistake
>>         Noted by various people (Sam, Jeff, Roland..)
>>         Commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2 intended to 
>> remove the
>>     xfs "Makefile-linux-2.6" file, but it was mistakenly still left in 
>> the
>>     tree as a empty file, and would cause git to correctly complain 
>> about a
>>     tracked file being removed after a "make distclean" (which removes 
>> empty
>>     files as garbage).
>>         And the asm-x86/desc_64.h file was supposed to be removed by 
>> commit
>>     c81c6ca45a69478c7877b729af1942d2b80ef582, but instead stayed around
>>     containing just a single newline.
>>         Get rid of them both properly.
>>         Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> -- 
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>