please pull from the trivial tree
Subsystems (14)
Linus, please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
This tree contains the following changes:
Adam D. Moss:
update for Documentation/sysrq.txt
Adrian Bunk:
remove pointers to the defunct UDF mailing list fs/qnx4/bitmap.c: #if 0 qnx4_new_block() update the email address of Randy Dunlap arch/arm26/nwfpe/fpmodule.c: remove kernel 2.0 #ifdef
Jim Cromie:
Documentation/filesystems/vfs.txt: typo fix
Kees Cook:
Documentation/SubmittingPatches: update Trivial Patch Monkey information
Matt Mackall:
s/retreiv/retriev/g
Paolo 'Blaisorblade' Giarrusso:
Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txt
Documentation/SubmittingPatches | 4 ++-- Documentation/block/biodoc.txt | 2 +- Documentation/filesystems/00-INDEX | 2 -- Documentation/filesystems/vfs.txt | 5 ++--- Documentation/scsi/scsi_mid_low_api.txt | 2 +- Documentation/sysrq.txt | 6 +----- MAINTAINERS | 4 +--- arch/arm26/nwfpe/fpmodule.c | 3 +-- drivers/char/n_hdlc.c | 2 +- drivers/net/tlan.c | 4 ++-- drivers/usb/class/usblp.c | 2 +- drivers/usb/serial/ftdi_sio.h | 2 +- drivers/video/aty/radeon_base.c | 16 ++++++++-------- fs/ntfs/ChangeLog | 2 +- fs/qnx4/bitmap.c | 2 ++ fs/reiserfs/xattr.c | 4 ++-- fs/udf/balloc.c | 5 ----- fs/udf/crc.c | 5 ----- fs/udf/dir.c | 5 ----- fs/udf/directory.c | 5 ----- fs/udf/file.c | 5 ----- fs/udf/fsync.c | 5 ----- fs/udf/ialloc.c | 5 ----- fs/udf/inode.c | 5 ----- fs/udf/lowlevel.c | 5 ----- fs/udf/misc.c | 5 ----- fs/udf/namei.c | 5 ----- fs/udf/partition.c | 5 ----- fs/udf/super.c | 5 ----- fs/udf/symlink.c | 5 ----- fs/udf/truncate.c | 5 ----- fs/udf/unicode.c | 5 ----- include/linux/udf_fs.h | 5 ----- include/linux/udf_fs_i.h | 5 ----- include/linux/udf_fs_sb.h | 5 ----- kernel/configs.c | 2 +- net/irda/iriap.c | 2 +- scripts/binoffset.c | 2 +- scripts/checkversion.pl | 2 +- scripts/kconfig/util.c | 2 +- scripts/patch-kernel | 4 ++-- 41 files changed, 34 insertions(+), 137 deletions(-)
Documentation/SubmittingPatches +2 -2
@@ -158,7 +158,7 @@ Even if the maintainer did not respond i copy the maintainer when you change their code. For small patches you may want to CC the Trivial Patch Monkey [email protected] set up by Rusty Russell; which collects "trivial" [email protected] managed by Adrian Bunk; which collects "trivial" patches. Trivial patches must qualify for one of the following rules: Spelling fixes in documentation Spelling fixes which could break grep(1).
@@ -171,7 +171,7 @@ patches. Trivial patches must qualify fo since people copy, as long as it's trivial) Any fix by the author/maintainer of the file. (ie. patch monkey in re-transmission mode) -URL: <http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/> +URL: <http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/>
Documentation/block/biodoc.txt +1 -1
@@ -31,7 +31,7 @@ The following people helped with review document: Christoph Hellwig <[email protected]> Arjan van de Ven <[email protected]> - Randy Dunlap <[email protected]> + Randy Dunlap <[email protected]> Andre Hedrick <[email protected]> The following people helped with fixes/contributions to the bio patches
Documentation/filesystems/00-INDEX +0 -2
@@ -18,8 +18,6 @@ devfs/ - directory containing devfs documentation. ext2.txt - info, mount options and specifications for the Ext2 filesystem. -fat_cvf.txt - - info on the Compressed Volume Files extension to the FAT filesystem hpfs.txt - info and mount options for the OS/2 HPFS. isofs.txt
Documentation/filesystems/vfs.txt +2 -3
@@ -162,9 +162,8 @@ get_sb() method fills in is the "s_op" f a "struct super_operations" which describes the next level of the filesystem implementation. -Usually, a filesystem uses generic one of the generic get_sb() -implementations and provides a fill_super() method instead. The -generic methods are: +Usually, a filesystem uses one of the generic get_sb() implementations +and provides a fill_super() method instead. The generic methods are: get_sb_bdev: mount a filesystem residing on a block device
Documentation/scsi/scsi_mid_low_api.txt +1 -1
@@ -1433,7 +1433,7 @@ The following people have contributed to Christoph Hellwig <hch at infradead dot org> Doug Ledford <dledford at redhat dot com> Andries Brouwer <Andries dot Brouwer at cwi dot nl> - Randy Dunlap <rddunlap at osdl dot org> + Randy Dunlap <rdunlap at xenotime dot net> Alan Stern <stern at rowland dot harvard dot edu>
Documentation/sysrq.txt +1 -5
@@ -202,17 +202,13 @@ you must call __handle_sysrq_nolock inst * I have more questions, who can I ask? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -You may feel free to send email to [email protected], and I will -respond as soon as possible. - -Myrdraal - And I'll answer any questions about the registration system you got, also responding as soon as possible. -Crutcher * Credits ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Written by Mydraal <[email protected]> +Written by Mydraal <[email protected]> Updated by Adam Sulmicki <[email protected]> Updated by Jeremy M. Dolan <[email protected]> 2001/01/28 10:15:59 Added to by Crutcher Dunnavant <[email protected]>
MAINTAINERS +1 -3
@@ -1465,7 +1465,6 @@ P: Several L: [email protected] W: http://www.kerneljanitors.org/ W: http://sf.net/projects/kernel-janitor/ -W: http://developer.osdl.org/rddunlap/kj-patches/ S: Maintained KERNEL NFSD
@@ -1486,7 +1485,7 @@ KEXEC P: Eric Biederman P: Randy Dunlap M: [email protected] -M: [email protected] +M: [email protected] W: http://www.xmission.com/~ebiederm/files/kexec/ L: [email protected] L: [email protected]
@@ -2587,7 +2586,6 @@ S: Maintained UDF FILESYSTEM P: Ben Fennema M: [email protected] -L: [email protected] W: http://linux-udf.sourceforge.net S: Maintained
arch/arm26/nwfpe/fpmodule.c +1 -2
@@ -46,10 +46,9 @@ typedef struct task_struct* PTASK;#ifdef MODULE void fp_send_sig (unsigned long sig,PTASK p,int priv); -#if LINUX_VERSION_CODE >0x20115 +MODULE_AUTHOR ("Scott Bambrough <[email protected]>" );MODULE_DESCRIPTION ("NWFPE floating point emulator" ); -#endif #else #define fp_send_sig send_sig
drivers/char/n_hdlc.c +1 -1
@@ -562,7 +562,7 @@ static void n_hdlc_tty_receive(struct tt }/* end of n_hdlc_tty_receive() */ /** -* n_hdlc_tty_read - Called to retreive one frame of data (if available) +* n_hdlc_tty_read - Called to retrieve one frame of data (if available) * @tty - pointer to tty instance data * @file - pointer to open file object * @buf - pointer to returned data buffer
drivers/net/tlan.c +2 -2
@@ -2865,11 +2865,11 @@ void TLan_PhyMonitor( struct net_device* for this device. * phy The address of the PHY to be queried. * reg The register whose contents are to be -* retreived. +* retrieved. * val A pointer to a variable to store the * retrieved value. * -* This function uses the TLAN's MII bus to retreive the contents +* This function uses the TLAN's MII bus to retrieve the contents * of a given register on a PHY. It sends the appropriate info * and then reads the 16-bit register value from the MII bus via * the TLAN SIO register.
drivers/usb/class/usblp.c +1 -1
@@ -3,7 +3,7 @@* * Copyright (c) 1999 Michael Gee <[email protected]> * Copyright (c) 1999 Pavel Machek <[email protected]> -* Copyright (c) 2000 Randy Dunlap <[email protected]> +* Copyright (c) 2000 Randy Dunlap <[email protected]> * Copyright (c) 2000 Vojtech Pavlik <[email protected]> # Copyright (c) 2001 Pete Zaitcev <[email protected]> # Copyright (c) 2001 David Paschal <[email protected]>
drivers/usb/serial/ftdi_sio.h +1 -1
@@ -714,7 +714,7 @@ typedef enum {*/ /* FTDI_SIO_GET_MODEM_STATUS */ -/* Retreive the current value of the modem status register */ +/* Retrieve the current value of the modem status register */ #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0#define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS
drivers/video/aty/radeon_base.c +8 -8
@@ -594,7 +594,7 @@ static int __devinit radeon_probe_pll_pa }/* -* Retreive PLL infos by different means (BIOS, Open Firmware, register probing...) +* Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...) */ static void __devinit radeon_get_pllinfo (struct radeonfb_info *rinfo) {
@@ -660,17 +660,17 @@ static void __devinit radeon_get_pllinfo#ifdef CONFIG_PPC_OF /* -* Retreive PLL infos from Open Firmware first +* Retrieve PLL infos from Open Firmware first */ if (!force_measure_pll &&radeon_read_xtal_OF (rinfo) ==0 ) { -printk (KERN_INFO "radeonfb: Retreived PLL infos from Open Firmware\n" ); +printk (KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n" ); goto found; }#endif /* CONFIG_PPC_OF */ /* * Check out if we have an X86 which gave us some PLL informations -* and if yes, retreive them +* and if yes, retrieve them */ if (!force_measure_pll && rinfo->bios_seg) {u16 pll_info_block =BIOS_IN16 (rinfo->fp_bios_start +0x30 );
@@ -682,7 +682,7 @@ static void __devinit radeon_get_pllinfo rinfo->pll.ppll_min =BIOS_IN32 (pll_info_block +0x12 ); rinfo->pll.ppll_max =BIOS_IN32 (pll_info_block +0x16 ); -printk (KERN_INFO "radeonfb: Retreived PLL infos from BIOS\n" ); +printk (KERN_INFO "radeonfb: Retrieved PLL infos from BIOS\n" ); goto found; }
@@ -691,7 +691,7 @@ static void __devinit radeon_get_pllinfo* probe them */ if (radeon_probe_pll_params (rinfo) ==0 ) { -printk (KERN_INFO "radeonfb: Retreived PLL infos from registers\n" ); +printk (KERN_INFO "radeonfb: Retrieved PLL infos from registers\n" ); goto found; }
@@ -702,7 +702,7 @@ static void __devinit radeon_get_pllinfo found:/* -* Some methods fail to retreive SCLK and MCLK values, we apply default +* Some methods fail to retrieve SCLK and MCLK values, we apply default * settings in this case (200Mhz). If that really happne often, we could * fetch from registers instead... */
@@ -2393,7 +2393,7 @@ static int radeonfb_pci_register (struct rinfo->mapped_vram/1024);/* -* Map the BIOS ROM if any and retreive PLL parameters from +* Map the BIOS ROM if any and retrieve PLL parameters from * the BIOS. We skip that on mobility chips as the real panel * values we need aren't in the ROM but in the BIOS image in * memory. This is definitely not the best meacnism though,
fs/ntfs/ChangeLog +1 -1
@@ -884,7 +884,7 @@ ToDo/Notes: - Add handling for initialized_size != data_size in compressed files. - Reduce function local stack usage from 0x3d4 bytes to just noise in - fs/ntfs/upcase.c. (Randy Dunlap <[email protected]>) + fs/ntfs/upcase.c. (Randy Dunlap <[email protected]>) - Remove compiler warnings for newer gcc. - Pages are no longer kmapped by mm/filemap.c::generic_file_write() around calls to ->{prepare,commit}_write. Adapt NTFS appropriately
fs/qnx4/bitmap.c +2 -0
@@ -23,10 +23,12 @@#include <linux/buffer_head.h> #include <linux/bitops.h> +#if 0 int qnx4_new_block (struct super_block *sb) {return 0 ; } +#endif /* 0 */ static void count_bits (registerconst char *bmPart, registerint size,int *const tf)
fs/reiserfs/xattr.c +2 -2
@@ -115,8 +115,8 @@ static struct dentry *__get_xa_root(stru }/* Returns the dentry (or NULL) referring to the root of the extended -* attribute directory tree. If it has already been retreived, it is used. -* Otherwise, we attempt to retreive it from disk. It may also return +* attribute directory tree. If it has already been retrieved, it is used. +* Otherwise, we attempt to retrieve it from disk. It may also return * a pointer-encoded error. */ static inline struct dentry *get_xa_root (struct super_block *s)
fs/udf/balloc.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Block allocation handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/crc.c +0 -5
@@ -14,11 +14,6 @@* * AT&T gives permission for the free use of the CRC source code. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/dir.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Directory handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/directory.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Directory related functions * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/file.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * File handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/fsync.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Fsync handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/ialloc.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Inode allocation handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/inode.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Inode handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/lowlevel.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Low Level Device Routines for the UDF filesystem * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/misc.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Miscellaneous routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/namei.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Inode name handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/partition.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Partition handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/super.c +0 -5
@@ -14,11 +14,6 @@* http://www.ecma.ch/ * http://www.iso.org/ * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/symlink.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Symlink handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/truncate.c +0 -5
@@ -4,11 +4,6 @@* PURPOSE * Truncate handling routines for the OSTA-UDF(tm) filesystem. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
fs/udf/unicode.c +0 -5
@@ -11,11 +11,6 @@* UTF-8 is explained in the IETF RFC XXXX. * ftp://ftp.internic.net/rfc/rfcxxxx.txt * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team's mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
include/linux/udf_fs.h +0 -5
@@ -13,11 +13,6 @@* http://www.osta.org/ * http://www.ecma.ch/ * http://www.iso.org/ * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
include/linux/udf_fs_i.h +0 -5
@@ -3,11 +3,6 @@* * This file is intended for the Linux kernel/module. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
include/linux/udf_fs_sb.h +0 -5
@@ -3,11 +3,6 @@* * This include file is for the Linux kernel/module. * -* CONTACTS -* E-mail regarding any portion of the Linux UDF file system should be -* directed to the development team mailing list (run by majordomo): -* [email protected] -* * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from:
kernel/configs.c +1 -1
@@ -3,7 +3,7 @@* Echo the kernel .config file used to build the kernel * * Copyright (C) 2002 Khalid Aziz <[email protected]> -* Copyright (C) 2002 Randy Dunlap <[email protected]> +* Copyright (C) 2002 Randy Dunlap <[email protected]> * Copyright (C) 2002 Al Stone <[email protected]> * Copyright (C) 2002 Hewlett-Packard Company *
net/irda/iriap.c +1 -1
@@ -364,7 +364,7 @@ static void iriap_disconnect_request(str/* * Function iriap_getvaluebyclass (addr, name, attr) * -* Retreive all values from attribute in all objects with given class +* Retrieve all values from attribute in all objects with given class * name */ int iriap_getvaluebyclass_request(struct iriap_cb *self,
scripts/binoffset.c +1 -1
@@ -1,6 +1,6 @@/*************************************************************************** * binoffset.c -* (C) 2002 Randy Dunlap <[email protected]> +* (C) 2002 Randy Dunlap <[email protected]> # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by
scripts/checkversion.pl +1 -1
@@ -3,7 +3,7 @@ # checkversion find uses of LINUX_VERSION_CODE, KERNEL_VERSION, or # UTS_RELEASE without including <linux/version.h>, or cases of # including <linux/version.h> that don't need it. -# Copyright (C) 2003, Randy Dunlap <[email protected]> +# Copyright (C) 2003, Randy Dunlap <[email protected]> $| = 1;
scripts/kconfig/util.c +1 -1
@@ -101,7 +101,7 @@ void str_printf(struct gstr *gs, const cva_end (ap); } -/* Retreive value of growable string */ +/* Retrieve value of growable string */ const char *str_get (struct gstr *gs) {return gs->s;
scripts/patch-kernel +2 -2
@@ -45,7 +45,7 @@ # update usage message; # fix some whitespace damage; # be smarter about stopping when current version is larger than requested; -# Randy Dunlap <[email protected]>, 2004-AUG-18. +# Randy Dunlap <[email protected]>, 2004-AUG-18. # # Add better support for (non-incremental) 2.6.x.y patches; # If an ending version number if not specified, the script automatically
@@ -56,7 +56,7 @@ # patch-kernel does not normally support reverse patching, but does so when # applying EXTRAVERSION (x.y) patches, so that moving from 2.6.11.y to 2.6.11.z # is easy and handled by the script (reverse 2.6.11.y and apply 2.6.11.z). -# Randy Dunlap <[email protected]>, 2005-APR-08. +# Randy Dunlap <[email protected]>, 2005-APR-08. PNAME=patch-kernel