Skip to contentSkip to conversation

please pull from the trivial tree

PATCH Adrian Bunk 1 participant 1 message Nov 8, 2005

Subsystems (10)
lore
Share & tools
lore
#0 lore raw

Linus, please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git

This tree contains the following changes:

 Documentation/early-userspace/README       |    2 
 MAINTAINERS                                |    1 
 drivers/block/floppy.c                     |    8 -
 drivers/char/ftape/lowlevel/ftape-buffer.c |    1 
 fs/afs/callback.c                          |    1 
 fs/befs/attribute.c                        |  117 ---------------------
 fs/freevxfs/vxfs_bmap.c                    |    1 
 fs/freevxfs/vxfs_olt.c                     |    1 
 fs/ioprio.c                                |    1 
 fs/jffs/jffs_fm.c                          |    1 
 fs/partitions/ultrix.c                     |    1 
 fs/reiserfs/hashes.c                       |    1 
 include/linux/idr.h                        |    6 +
 mm/slab.c                                  |    2 
 14 files changed, 20 insertions(+), 124 deletions(-)

Adrian Bunk:
mm/slab.c: fix a comment typo
MAINTAINERS: PKTCDVD DRIVER: remove entry for a subscribers-only list fs/freevxfs/: add #include's
jffs_fm.c should #include "intrep.h"
fs/partitions/ultrix.c should #include "ultrix.h"
fs/reiserfs/hashes.c should #include <linux/reiserfs_fs.h> drivers/char/ftape/lowlevel/ftape-buffer.c should #include "../lowlevel/ftape-buffer.h" fs/afs/callback.c should #include "cmservice.h"
fs/ioprio.c should #include <linux/syscalls.h>

James Nelson:
floppy: relocate devfs comment

Jim Cromie:
earlyuserspace/README: fix homonym err

Luben Tuikov:
include/linux: enclose idr.h in #ifndef

Will Dyson:
remove unused fs/befs/attribute.c

Documentation/early-userspace/README +1 -1
index 270a88e..cddbac4 100644
@@ -28,7 +28,7 @@ the image from specifications.
 CPIO ARCHIVE method
 
 You can create a cpio archive that contains the early userspace image.
-Youre cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
+Your cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
 will be used directly.  Only a single cpio file may be specified in
 CONFIG_INITRAMFS_SOURCE and directory and file names are not allowed in
 combination with a cpio archive.
MAINTAINERS +0 -1
index 995bfd8..3028d4b 100644
@@ -1970,7 +1970,6 @@ PKTCDVD DRIVER
 P:	Peter Osterlund
 M:	[email protected]
 L:	[email protected]
-L:	[email protected]
 S:	Maintained
 
 POSIX CLOCKS and TIMERS
drivers/block/floppy.c +4 -4
index 5eadbb9..77cfd69 100644
@@ -98,6 +98,10 @@
  */
 
 /*
+ * 1998/1/21 -- Richard Gooch <[email protected]> -- devfs support
+ */
+
+/*
  * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
  * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
  * use of '0' for NULL.
@@ -158,10 +162,6 @@ static int print_unex = 1;
 #define FDPATCHES
 #include <linux/fdreg.h>
 
-/*
- * 1998/1/21 -- Richard Gooch <[email protected]> -- devfs support
- */
-
 #include <linux/fd.h>
 #include <linux/hdreg.h>
 
drivers/char/ftape/lowlevel/ftape-buffer.c +1 -0
index 54af20c..c706ff1 100644
@@ -33,6 +33,7 @@
 #include "../lowlevel/ftape-rw.h"
 #include "../lowlevel/ftape-read.h"
 #include "../lowlevel/ftape-tracing.h"
+#include "../lowlevel/ftape-buffer.h"
 
 /*  DMA'able memory allocation stuff.
  */
fs/afs/callback.c +1 -0
index 2fd62f8..9cb206e 100644
@@ -19,6 +19,7 @@
 #include "server.h"
 #include "vnode.h"
 #include "internal.h"
+#include "cmservice.h"
 
 /*****************************************************************************/
 /*
fs/befs/attribute.c deleted +0 -117

117 lines not on this page · raw message

fs/freevxfs/vxfs_bmap.c +1 -0
index d3f6b28..2d71128 100644
@@ -36,6 +36,7 @@
 
 #include "vxfs.h"
 #include "vxfs_inode.h"
+#include "vxfs_extern.h"
 
 
 #ifdef DIAGNOSTIC
fs/freevxfs/vxfs_olt.c +1 -0
index 1334762..76a0708 100644
@@ -36,6 +36,7 @@
 
 #include "vxfs.h"
 #include "vxfs_olt.h"
+#include "vxfs_extern.h"
 
 
 static inline void
fs/ioprio.c +1 -0
index d1c1f2b..4bf1c63 100644
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/ioprio.h>
 #include <linux/blkdev.h>
+#include <linux/syscalls.h>
 
 static int set_task_ioprio(struct task_struct *task, int ioprio)
 {
fs/jffs/jffs_fm.c +1 -0
index 053e3a9..6da13b3 100644
@@ -20,6 +20,7 @@
 #include <linux/blkdev.h>
 #include <linux/jffs.h>
 #include "jffs_fm.h"
+#include "intrep.h"
 
 #if defined(JFFS_MARK_OBSOLETE) && JFFS_MARK_OBSOLETE
 static int jffs_mark_obsolete(struct jffs_fmcontrol *fmc, __u32 fm_offset);
fs/partitions/ultrix.c +1 -0
index 8a8d4d9..ec852c1 100644
@@ -7,6 +7,7 @@
  */
 
 #include "check.h"
+#include "ultrix.h"
 
 int ultrix_partition(struct parsed_partitions *state, struct block_device *bdev)
 {
fs/reiserfs/hashes.c +1 -0
index 37c1306..a3ec238 100644
@@ -19,6 +19,7 @@
 //
 
 #include <linux/kernel.h>
+#include <linux/reiserfs_fs.h>
 #include <asm/types.h>
 #include <asm/bug.h>
 
include/linux/idr.h +6 -0
index 7fb3ff9..d37c8d8 100644
@@ -8,6 +8,10 @@
  * Small id to pointer translation service avoiding fixed sized
  * tables.
  */
+
+#ifndef __IDR_H__
+#define __IDR_H__
+
 #include <linux/types.h>
 #include <linux/bitops.h>
 
@@ -77,3 +81,5 @@ int idr_get_new_above(struct idr *idp, v
 void idr_remove(struct idr *idp, int id);
 void idr_destroy(struct idr *idp);
 void idr_init(struct idr *idp);
+
+#endif /* __IDR_H__ */
mm/slab.c +1 -1
index e291f5e..8a73dcf 100644
@@ -434,7 +434,7 @@ struct kmem_cache {
 /* Optimization question: fewer reaps means less 
  * probability for unnessary cpucache drain/refill cycles.
  *
- * OTHO the cpuarrays can contain lots of objects,
+ * OTOH the cpuarrays can contain lots of objects,
  * which could lock up otherwise freeable slabs.
  */
 #define REAPTIMEOUT_CPUC	(2*HZ)