please pull from the trivial tree
Subsystems (17)
Linus, please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
This tree contains the following changes:
Adrian Bunk:
ftape: remove some outdated information from Kconfig files drivers/net/{,wireless/}Kconfig: remove dead URL
spelling: s/appropiate/appropriate/
SOFTWARE_SUSPEND: fix a typo in the dependencies
Alex Shepard:
Spelling fix in IPW2100 and IPW2200 Kconfig entries
Alexey Dobriyan:
Fix "stuct", "strut", "struc" typos
Christian Kujau:
correct email address of Manfred Spraul
Domen Puncer:
remove unused LOCAL_END_REQUEST
Horms:
MAINTAINERS: better list for "POSIX CLOCKS and TIMERS"
Jesper Juhl:
return statement cleanup - kill pointless parentheses Spelling fix in init/Kconfig for the help of CONFIG_SWAP
MAINTAINERS: CIFS: add [email protected] list
Randy Dunlap:
Documentation/hpet.txt typo
Documentation/DocBook/videobook.tmpl | 4 Documentation/cachetlb.txt | 2 Documentation/hpet.txt | 2 Documentation/input/ff.txt | 2 Documentation/ioctl/hdio.txt | 2 Documentation/laptop-mode.txt | 2 Documentation/networking/sk98lin.txt | 2 Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 2 Documentation/x86_64/boot-options.txt | 2 MAINTAINERS | 3 arch/i386/kernel/vm86.c | 2 arch/um/include/sysdep-i386/checksum.h | 4 drivers/block/floppy.c | 1 drivers/char/Kconfig | 10 drivers/char/ftape/Kconfig | 12 drivers/char/stallion.c | 128 +++++----- drivers/net/Kconfig | 4 drivers/net/wan/lmc/lmc_main.c | 2 drivers/net/wireless/Kconfig | 8 drivers/s390/scsi/zfcp_erp.c | 2 drivers/scsi/FlashPoint.c | 2 drivers/scsi/gdth.c | 2 fs/efs/super.c | 5 fs/sysv/ChangeLog | 2 fs/xfs/quota/xfs_qm.c | 114 ++++---- fs/xfs/xfs_dir_leaf.c | 96 +++---- fs/xfs/xfs_fsops.c | 4 fs/xfs/xfs_log.c | 52 ++-- fs/xfs/xfs_mount.c | 66 ++--- fs/xfs/xfs_trans_item.c | 22 - fs/xfs/xfs_vnodeops.c | 59 ++-- include/asm-v850/ptrace.h | 2 include/linux/pfkeyv2.h | 2 init/Kconfig | 2 ipc/msg.c | 2 ipc/sem.c | 2 ipc/util.c | 2 ipc/util.h | 2 kernel/power/Kconfig | 2 kernel/printk.c | 2 sound/oss/opl3sa2.c | 2 41 files changed, 306 insertions(+), 334 deletions(-)
Documentation/DocBook/videobook.tmpl +2 -2
@@ -229,7 +229,7 @@ int __init myradio_init(struct video_ini static int users = 0; -static int radio_open(stuct video_device *dev, int flags) +static int radio_open(struct video_device *dev, int flags) { if(users) return -EBUSY;
@@ -949,7 +949,7 @@ int __init mycamera_init(struct video_in static int users = 0; -static int camera_open(stuct video_device *dev, int flags) +static int camera_open(struct video_device *dev, int flags) { if(users) return -EBUSY;
Documentation/cachetlb.txt +1 -1
@@ -136,7 +136,7 @@ changes occur: 8) void lazy_mmu_prot_update(pte_t pte) This interface is called whenever the protection on any user PTEs change. This interface provides a notification - to architecture specific code to take appropiate action. + to architecture specific code to take appropriate action. Next, we have the cache flushing interfaces. In general, when Linux
Documentation/hpet.txt +1 -1
@@ -2,7 +2,7 @@ The High Precision Event Timer (HPET) hardware is the future replacement for the 8254 and Real Time Clock (RTC) periodic timer functionality. -Each HPET can have up two 32 timers. It is possible to configure the +Each HPET can have up to 32 timers. It is possible to configure the first two timers as legacy replacements for 8254 and RTC periodic timers. A specification done by Intel and Microsoft can be found at <http://www.intel.com/hardwaredesign/hpetspec.htm>.
Documentation/input/ff.txt +1 -1
@@ -120,7 +120,7 @@ to the unique id assigned by the driver. some operations (removing an effect, controlling the playback). This if field must be set to -1 by the user in order to tell the driver to allocate a new effect. -See <linux/input.h> for a description of the ff_effect stuct. You should also +See <linux/input.h> for a description of the ff_effect struct. You should also find help in a few sketches, contained in files shape.fig and interactive.fig. You need xfig to visualize these files.
Documentation/ioctl/hdio.txt +1 -1
@@ -946,7 +946,7 @@ HDIO_SCAN_HWIF register and (re)scan i This ioctl initializes the addresses and irq for a disk controller, probes for drives, and creates /proc/ide - interfaces as appropiate. + interfaces as appropriate.
Documentation/laptop-mode.txt +1 -1
@@ -357,7 +357,7 @@ MAX_AGE=${MAX_AGE:-'600'} # Read-ahead, in kilobytes READAHEAD=${READAHEAD:-'4096'} -# Shall we remount journaled fs. with appropiate commit interval? (1=yes) +# Shall we remount journaled fs. with appropriate commit interval? (1=yes) DO_REMOUNTS=${DO_REMOUNTS:-'1'} # And shall we add the "noatime" option to that as well? (1=yes)
Documentation/networking/sk98lin.txt +1 -1
@@ -91,7 +91,7 @@ To use the driver as a module, proceed a with (M) 5. Execute the command "make modules". 6. Execute the command "make modules_install". - The appropiate modules will be installed. + The appropriate modules will be installed. 7. Reboot your system.
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +1 -1
@@ -5577,7 +5577,7 @@ struct _snd_pcm_runtime { <informalexample> <programlisting> <![CDATA[ - static int mychip_suspend(strut pci_dev *pci, pm_message_t state) + static int mychip_suspend(struct pci_dev *pci, pm_message_t state) { /* (1) */ struct snd_card *card = pci_get_drvdata(pci);
Documentation/x86_64/boot-options.txt +1 -1
@@ -198,6 +198,6 @@ Debugging Misc - noreplacement Don't replace instructions with more appropiate ones + noreplacement Don't replace instructions with more appropriate ones for the CPU. This may be useful on asymmetric MP systems where some CPU have less capabilities than the others.
MAINTAINERS +2 -1
@@ -549,6 +549,7 @@ S: Maintained COMMON INTERNET FILE SYSTEM (CIFS) P: Steve French M: [email protected] +L: [email protected] L: [email protected] W: http://us1.samba.org/samba/Linux_CIFS_client.html T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
@@ -2053,7 +2054,7 @@ S: Maintained POSIX CLOCKS and TIMERS P: George Anzinger M: [email protected] -L: [email protected] +L: [email protected] S: Supported POWERPC 4xx EMAC DRIVER
arch/i386/kernel/vm86.c +1 -1
@@ -4,7 +4,7 @@* Copyright (C) 1994 Linus Torvalds * * 29 dec 2001 - Fixed oopses caused by unchecked access to the vm86 -* stack - Manfred Spraul <[email protected]> +* stack - Manfred Spraul <[email protected]> * * 22 mar 2002 - Manfred detected the stackfaults, but didn't handle * them correctly. Now the emulation will be in a
arch/um/include/sysdep-i386/checksum.h +2 -2
@@ -36,7 +36,7 @@ unsigned int csum_partial_copy_nocheck(c int len, int sum) {memcpy (dst ,src ,len ); -return (csum_partial (dst, len, sum)); +return csum_partial (dst, len, sum); }/*
@@ -104,7 +104,7 @@ static inline unsigned short ip_fast_csu : "=r" (sum), "=r" (iph), "=r" (ihl) : "1" (iph), "2" (ihl) : "memory"); -return (sum); +return sum; }/*
drivers/block/floppy.c +0 -1
@@ -242,7 +242,6 @@ static int allowed_drive_mask = 0x33;static int irqdma_allocated; -#define LOCAL_END_REQUEST #define DEVICE_NAME "floppy"#include <linux/blkdev.h>
drivers/char/Kconfig +0 -10
@@ -881,16 +881,6 @@ config FTAPE module. To compile this driver as a module, choose M here: the module will be called ftape. - Note that the Ftape-HOWTO is out of date (sorry) and documents the - older version 2.08 of this software but still contains useful - information. There is a web page with more recent documentation at - <http://www.instmath.rwth-aachen.de/~heine/ftape/>. This page - always contains the latest release of the ftape driver and useful - information (backup software, ftape related patches and - documentation, FAQ). Note that the file system interface has - changed quite a bit compared to previous versions of ftape. Please - read <file:Documentation/ftape.txt>. - source "drivers/char/ftape/Kconfig" endmenu
drivers/char/ftape/Kconfig +1 -11
@@ -25,17 +25,7 @@ config ZFTAPE support", above) then `zft-compressor' will be loaded automatically by zftape when needed. - Despite its name, zftape does NOT use compression by default. The - file <file:Documentation/ftape.txt> contains a short description of - the most important changes in the file system interface compared to - previous versions of ftape. The ftape home page - <http://www.instmath.rwth-aachen.de/~heine/ftape/> contains - further information. - - IMPORTANT NOTE: zftape can read archives created by previous - versions of ftape and provide file mark support (i.e. fast skipping - between tape archives) but previous version of ftape will lack file - mark support when reading archives produced by zftape. + Despite its name, zftape does NOT use compression by default. config ZFT_DFLT_BLK_SZ int "Default block size"
drivers/char/stallion.c +64 -64
419 lines not on this page · raw message
drivers/net/Kconfig +0 -4
@@ -2676,10 +2676,6 @@ config SHAPER Class-Based Queueing (CBQ) scheduling support which you get if you say Y to "QoS and/or fair queueing" above. - To set up and configure shaper devices, you need the shapecfg - program, available from <ftp://shadow.cabi.net/pub/Linux/> in the - shaper package. - To compile this driver as a module, choose M here: the module will be called shaper. If unsure, say N.
drivers/net/wan/lmc/lmc_main.c +1 -1
@@ -641,7 +641,7 @@ static void lmc_watchdog (unsigned longspin_lock_irqsave (&sc->lmc_lock, flags);if (sc->check !=0xBEAFCAFE ){ -printk ("LMC: Corrupt net_device stuct, breaking out\n" ); +printk ("LMC: Corrupt net_device struct, breaking out\n" );spin_unlock_irqrestore (&sc->lmc_lock, flags);return ; }
drivers/net/wireless/Kconfig +2 -6
@@ -24,10 +24,6 @@ config NET_RADIO the tools from <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. - Some user-level drivers for scarab devices which don't require - special kernel support are available from - <ftp://shadow.cabi.net/pub/Linux/>. - # Note : the cards are obsolete (can't buy them anymore), but the drivers # are not, as people are still using them... comment "Obsolete Wireless cards support (pre-802.11)"
@@ -160,7 +156,7 @@ config IPW2100 <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. If you want to compile the driver as a module ( = code which can be - inserted in and remvoed from the running kernel whenever you want), + inserted in and removed from the running kernel whenever you want), say M here and read <file:Documentation/modules.txt>. The module will be called ipw2100.ko.
@@ -213,7 +209,7 @@ config IPW2200 <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. If you want to compile the driver as a module ( = code which can be - inserted in and remvoed from the running kernel whenever you want), + inserted in and removed from the running kernel whenever you want), say M here and read <file:Documentation/modules.txt>. The module will be called ipw2200.ko.
drivers/s390/scsi/zfcp_erp.c +1 -1
@@ -3403,7 +3403,7 @@ zfcp_erp_action_dequeue(struct zfcp_erp_/** * zfcp_erp_action_cleanup * -* Register unit with scsi stack if appropiate and fix reference counts. +* Register unit with scsi stack if appropriate and fix reference counts. * Note: Temporary units are not registered with scsi stack. */ static void
drivers/scsi/FlashPoint.c +1 -1
@@ -149,7 +149,7 @@ typedef SCCBMGR_INFO * PSCCBMGR_INF#define PCI_BUS_CARD 0x03#define VESA_BUS_CARD 0x04 -/* SCCB struc used for both SCCB and UCB manager compiles! +/* SCCB struct used for both SCCB and UCB manager compiles! * The UCB Manager treats the SCCB as it's 'native hardware structure' */
drivers/scsi/gdth.c +1 -1
@@ -328,7 +328,7 @@* hdr_channel:x x - number of virtual bus for host drives * shared_access:Y disable driver reserve/release protocol to * access a shared resource from several nodes, -* appropiate controller firmware required +* appropriate controller firmware required * shared_access:N enable driver reserve/release protocol * probe_eisa_isa:Y scan for EISA/ISA controllers * probe_eisa_isa:N do not scan for EISA/ISA controllers
fs/efs/super.c +3 -2
@@ -222,12 +222,13 @@ static efs_block_t efs_validate_vh(struc sblock);#endif } -return (sblock); +return sblock; }static int efs_validate_super (struct efs_sb_info *sb,struct efs_super *super) { -if (!IS_EFS_MAGIC (be32_to_cpu (super->fs_magic)))return -1 ; +if (!IS_EFS_MAGIC (be32_to_cpu (super->fs_magic))) +return -1 ; sb->fs_magic =be32_to_cpu (super->fs_magic); sb->total_blocks =be32_to_cpu (super->fs_size);
fs/sysv/ChangeLog +1 -1
@@ -54,7 +54,7 @@ Fri Jan 4 2002 Alexander Viro <viro@p (sysv_read_super): Likewise. (v7_read_super): Likewise. -Sun Dec 30 2001 Manfred Spraul <[email protected]> +Sun Dec 30 2001 Manfred Spraul <[email protected]> * dir.c (dir_commit_chunk): Do not set dir->i_version. (sysv_readdir): Likewise.
fs/xfs/quota/xfs_qm.c +57 -57
433 lines not on this page · raw message
fs/xfs/xfs_dir_leaf.c +48 -48
358 lines not on this page · raw message
fs/xfs/xfs_fsops.c +2 -2
@@ -501,7 +501,7 @@ xfs_reserve_blocks(if (inval == (__uint64_t *)NULL ) { outval->resblks = mp->m_resblks; outval->resblks_avail = mp->m_resblks_avail; -return (0 ); +return 0 ; } request = *inval;
@@ -537,7 +537,7 @@ xfs_reserve_blocks( outval->resblks = mp->m_resblks; outval->resblks_avail = mp->m_resblks_avail;XFS_SB_UNLOCK (mp, s); -return (0 ); +return 0 ; }void
fs/xfs/xfs_log.c +26 -26
196 lines not on this page · raw message
fs/xfs/xfs_mount.c +33 -33
195 lines not on this page · raw message
fs/xfs/xfs_trans_item.c +11 -11
@@ -78,7 +78,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_ lidp->lid_size =0 ; lip->li_desc = lidp; lip->li_mountp = tp->t_mountp; -return (lidp); +return lidp; }/*
@@ -119,7 +119,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_ lidp->lid_size =0 ; lip->li_desc = lidp; lip->li_mountp = tp->t_mountp; -return (lidp); +return lidp; }/*
@@ -180,7 +180,7 @@ xfs_trans_find_item(xfs_trans_t *tp, xfs {ASSERT (lip->li_desc !=NULL ); -return (lip->li_desc); +return lip->li_desc; }
@@ -219,10 +219,10 @@ xfs_trans_first_item(xfs_trans_t *tp)continue ; } -return (XFS_LIC_SLOT (licp, i)); +return XFS_LIC_SLOT (licp, i); }cmn_err (CE_WARN ,"xfs_trans_first_item() -- no first item" ); -return (NULL ); +return NULL ; }
@@ -252,7 +252,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfscontinue ; } -return (XFS_LIC_SLOT (licp, i)); +return XFS_LIC_SLOT (licp, i); }/*
@@ -261,7 +261,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs* If there is no next chunk, return NULL. */ if (licp->lic_next ==NULL ) { -return (NULL ); +return NULL ; } licp = licp->lic_next;
@@ -271,7 +271,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfscontinue ; } -return (XFS_LIC_SLOT (licp, i)); +return XFS_LIC_SLOT (licp, i); }ASSERT (0 );/* NOTREACHED */
@@ -425,7 +425,7 @@ xfs_trans_unlock_chunk( } } -return (freed); +return freed; }
@@ -478,7 +478,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_*/ lbsp->lbc_ag = ag; lbsp->lbc_idx = idx; -return (lbsp); +return lbsp; }/*
@@ -512,7 +512,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_ tp->t_busy_free--; lbsp->lbc_ag = ag; lbsp->lbc_idx = idx; -return (lbsp); +return lbsp; }
fs/xfs/xfs_vnodeops.c +29 -30
223 lines not on this page · raw message
include/asm-v850/ptrace.h +1 -1
@@ -92,7 +92,7 @@ struct pt_regs/* The number of bytes used to store each register. */ #define _PT_REG_SIZE 4 -/* Offset of a general purpose register in a stuct pt_regs. */ +/* Offset of a general purpose register in a struct pt_regs. */ #define PT_GPR (num) ((num) * _PT_REG_SIZE)/* Offsets of various special registers & fields in a struct pt_regs. */
include/linux/pfkeyv2.h +1 -1
@@ -104,7 +104,7 @@ struct sadb_prop {/* followed by: struct sadb_comb sadb_combs[(sadb_prop_len + sizeof(uint64_t) - sizeof(struct sadb_prop)) / -sizeof(strut sadb_comb)]; */ +sizeof(struct sadb_comb)]; */ struct sadb_comb {uint8_t sadb_comb_auth;
init/Kconfig +1 -1
@@ -99,7 +99,7 @@ config SWAP default y help This option allows you to choose whether you want to have support - for socalled swap devices or swap files in your kernel that are + for so called swap devices or swap files in your kernel that are used to provide more virtual memory than the actual RAM present in your computer. If unsure say Y.
ipc/msg.c +1 -1
@@ -12,7 +12,7 @@* * mostly rewritten, threaded and wake-one semantics added * MSGMAX limit removed, sysctl's added -* (c) 1999 Manfred Spraul <[email protected]> +* (c) 1999 Manfred Spraul <[email protected]> */ #include <linux/capability.h>
ipc/sem.c +1 -1
@@ -56,7 +56,7 @@* /proc/sysvipc/sem support (c) 1999 Dragos Acostachioaie <[email protected]> * * SMP-threaded, sysctl's added -* (c) 1999 Manfred Spraul <[email protected]> +* (c) 1999 Manfred Spraul <[email protected]> * Enforced range limit on SEM_UNDO * (c) 2001 Red Hat Inc <[email protected]> * Lockless wakeup
ipc/util.c +1 -1
@@ -7,7 +7,7 @@* Occurs in several places in the IPC code. * Chris Evans, <[email protected]> * Nov 1999 - ipc helper functions, unified SMP locking -* Manfred Spraul <[email protected]> +* Manfred Spraul <[email protected]> * Oct 2002 - One lock per IPC id. RCU ipc_free for lock-free grow_ary(). * Mingming Cao <[email protected]> */
ipc/util.h +1 -1
@@ -2,7 +2,7 @@* linux/ipc/util.h * Copyright (C) 1999 Christoph Rohland * -* ipc helper functions (c) 1999 Manfred Spraul <[email protected]> +* ipc helper functions (c) 1999 Manfred Spraul <[email protected]> */ #ifndef _IPC_UTIL_H
kernel/power/Kconfig +1 -1
@@ -38,7 +38,7 @@ config PM_DEBUG config SOFTWARE_SUSPEND bool "Software Suspend" - depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP) + depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP) ---help--- Enable the possibility of suspending the machine. It doesn't need APM.
kernel/printk.c +1 -1
@@ -11,7 +11,7 @@* Ted Ts'o, 2/11/93. * Modified for sysctl support, 1/8/97, Chris Horn. * Fixed SMP synchronization, 08/08/99, Manfred Spraul -* [email protected] +* [email protected] * Rewrote bits to get rid of console_lock * 01Mar01 Andrew Morton <[email protected]> */
sound/oss/opl3sa2.c +1 -1
@@ -530,7 +530,7 @@ static void __init attach_opl3sa2_mss(stif (hw_config->slots[0 ] !=-1 ) {/* Did the MSS driver install? */ if (num_mixers == (initial_mixers +1 )) { -/* The MSS mixer is installed, reroute mixers appropiately */ +/* The MSS mixer is installed, reroute mixers appropriately */ AD1848_REROUTE (SOUND_MIXER_LINE1 ,SOUND_MIXER_CD );AD1848_REROUTE (SOUND_MIXER_LINE2 ,SOUND_MIXER_SYNTH );AD1848_REROUTE (SOUND_MIXER_LINE3 ,SOUND_MIXER_LINE );