Re: [GIT] Please pull NFS updates...

[Linus Torvalds <torvalds@osdl.org>]

On Sun, 25 Jun 2006, Trond Myklebust wrote:
> 
> Please pull from the repository at
> 
>    git pull git://git.linux-nfs.org/pub/linux/nfs-2.6.git

This is broken.

	  CC      fs/nfs/nfs2xdr.o
	In file included from fs/nfs/nfs2xdr.c:28:
	fs/nfs/internal.h:7: error: redefinition of 'struct nfs_clone_mount'
	fs/nfs/internal.h:99: error: redefinition of 'nfs4_path'
	fs/nfs/internal.h:99: error: previous definition of 'nfs4_path' was here
	fs/nfs/internal.h:113: error: redefinition of 'nfs_devname'
	fs/nfs/internal.h:113: error: previous definition of 'nfs_devname' was here
	fs/nfs/internal.h:122: error: redefinition of 'nfs_block_bits'
	fs/nfs/internal.h:122: error: previous definition of 'nfs_block_bits' was here
	fs/nfs/internal.h:141: error: redefinition of 'nfs_calc_block_size'
	fs/nfs/internal.h:141: error: previous definition of 'nfs_calc_block_size' was here
	fs/nfs/internal.h:151: error: redefinition of 'nfs_block_size'
	fs/nfs/internal.h:151: error: previous definition of 'nfs_block_size' was here
	fs/nfs/internal.h:165: error: redefinition of 'nfs_super_set_maxbytes'
	fs/nfs/internal.h:165: error: previous definition of 'nfs_super_set_maxbytes' was here
	fs/nfs/internal.h:175: error: redefinition of 'valid_ipaddr4'
	fs/nfs/internal.h:175: error: previous definition of 'valid_ipaddr4' was here
	make[2]: *** [fs/nfs/nfs2xdr.o] Error 1
	make[1]: *** [fs/nfs] Error 2
	make: *** [fs] Error 2

Looks like a merge error, causing that "internal.h" file to be included
twice. 

Alternatively, you're applying patches without "--fuzz=0", which allowed
Andrew's "git-nfs-build-fixes" patch to be applied wice.

In either case, it came from your tree, and had apparently never even
been compile-tested. 

Tssk, tssk..

		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/