Messages in this thread | | | Date | Fri, 8 Aug 2014 16:20:18 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the vfs tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in include/linux/fs.h between commit ed44724b79d8 ("acct: switch to __kernel_write()") from the vfs tree and commit "fs.h: remove unnecessary extern prototypes" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/fs.h index 94187721ad41,dccf4bcc21bb..000000000000 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@@ -2357,16 -2356,15 +2357,16 @@@ static inline void i_readcount_inc(stru return; } #endif - extern int do_pipe_flags(int *, int); + int do_pipe_flags(int *, int); - extern int kernel_read(struct file *, loff_t, char *, unsigned long); - extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t); - extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *); - extern struct file * open_exec(const char *); + int kernel_read(struct file *, loff_t, char *, unsigned long); + ssize_t kernel_write(struct file *, const char *, size_t, loff_t); ++ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *); + struct file * open_exec(const char *); /* fs/dcache.c -- generic fs support functions */ - extern int is_subdir(struct dentry *, struct dentry *); - extern int path_is_under(struct path *, struct path *); + int is_subdir(struct dentry *, struct dentry *); + int path_is_under(struct path *, struct path *); #include <linux/err.h> [unhandled content-type:application/pgp-signature] | |