Messages in this thread Patch in this message | | | Date | Fri, 25 Mar 2005 11:50:51 +1200 | From | Reuben Farrelly <> | Subject | Re: 2.6.12-rc1-mm2 |
| |
Hi,
Andrew Morton wrote: > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc1/2.6.12-rc1-mm2/ > > > - Added David Miller's networking tree to the -mm lineup as bk-net.patch. > > - Added Herbert Xu's crypto development tree to the -mm lineup as > bk-cryptodev.patch. > > -mm kernels now aggregate Linus's tree and 34 subsystem trees. Usually > they are pulled 3-4 hours before the release of the -mm kernel. > > Usually it is possible to determine the latest cset from each tree by > looking at the first couple of lines of the relevant patch in the > broken-out/ directory. Although sometimes it isn't there if I had to > massage the diff. > > - There may be an x86_64 problem here, although it works for me. If it > fails early in boot, try reverting > x86_64-separate-amd-cmp-detection-from-hyper-threading.patch > > - There's some work here on the recent USB PM resume bugs. If you had > problems there, please test and be sure to cc > linux-usb-devel@lists.sourceforge.net in any reports. > > - Some fixes for the recent DRM problems. > > - Big DVB update > > - md updates > > - nfs4 server updates > > - Lots more fixes > > - Lots more bugs.
Fails to compile for me:
CC [M] fs/nfs/dir.o CC [M] fs/nfs/inode.o CC [M] fs/nfs/nfs4proc.o fs/nfs/nfs4proc.c:2976: error: static declaration of 'nfs4_file_inode_operations' follows non-static declaration fs/nfs/nfs4_fs.h:179: error: previous declaration of 'nfs4_file_inode_operations' was here make[2]: *** [fs/nfs/nfs4proc.o] Error 1 make[1]: *** [fs/nfs] Error 2 make: *** [fs] Error 2
I needed to remove this line:
extern struct inode_operations nfs4_file_inode_operations;
from fs/nfs/nfs4_fs.h.
Patch attached.
Reuben
--- fs/nfs/nfs4_fs.h 2005-03-25 11:40:51.000000000 +1200 +++ fs/nfs/nfs4_fs.h 2005-03-25 11:44:28.000000000 +1200 @@ -176,7 +176,6 @@ extern struct dentry_operations nfs4_dentry_operations; extern struct inode_operations nfs4_dir_inode_operations; -extern struct inode_operations nfs4_file_inode_operations; /* inode.c */ extern ssize_t nfs4_getxattr(struct dentry *, const char *, void *, size_t); | |