Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Steven Whitehouse [Mon, 3 Jul 2006 14:25:08 +0000 (10:25 -0400)]
Conflicts:

include/linux/kernel.h

1  2 
CREDITS
MAINTAINERS
fs/Kconfig
fs/Makefile
include/linux/fs.h
include/linux/kernel.h
kernel/printk.c
mm/filemap.c
mm/readahead.c

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc fs/Makefile
Simple merge
Simple merge
@@@ -29,7 -32,7 +32,8 @@@ extern const char linux_banner[]
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
 +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+ #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
  
  #define       KERN_EMERG      "<0>"   /* system is unusable                   */
  #define       KERN_ALERT      "<1>"   /* action must be taken immediately     */
diff --cc kernel/printk.c
Simple merge
diff --cc mm/filemap.c
@@@ -1044,9 -1122,14 +1122,15 @@@ success
        desc->arg.buf += size;
        return size;
  }
 +EXPORT_SYMBOL_GPL(file_read_actor);
  
- /*
+ /**
+  * __generic_file_aio_read - generic filesystem read routine
+  * @iocb:     kernel I/O control block
+  * @iov:      io vector request
+  * @nr_segs:  number of segments in the iovec
+  * @ppos:     current file position
+  *
   * This is the "read()" routine for all filesystems
   * that can use the page cache directly.
   */
diff --cc mm/readahead.c
Simple merge