The following changes since commit faf80d62e44dc627efb741f48db50c1858d1667c:
Linus Torvalds (1):
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6.git master
Jaswinder Singh Rajput (22):
trivial: fix typo "a a" in multiple files
trivial: fix typo "and and" in multiple files
trivial: fix typo "are are" in multiple files
trivial: fix typo "as as" in multiple files
trivial: fix typo "be be" in multiple files
trivial: fix typo "bit bit" in multiple files
trivial: fix typo "by by" in multiple files
trivial: fix typo "can can"
trivial: fix typo "could could" in multiple files
trivial: fix typo "from from" in multiple files
trivial: fix typo "has has" in multiple files
trivial: fix typo "lock lock"
trivial: fix typo "on on" in multiple files
trivial: fix typo "should should" in multiple files
trivial: fix typo "test test"
trivial: fix typo "that that" in multiple files
trivial: fix typo "this this" in multiple files
trivial: fix typo "too too"
trivial: fix typo "was was" in multiple files
trivial: fix typo "we we" in multiple files
trivial: fix typo "with with" in multiple files
trivial: fix typo "you you"
Documentation/DocBook/uio-howto.tmpl | 2 +-
Documentation/RCU/rcu.txt | 2 +-
Documentation/block/as-iosched.txt | 2 +-
Documentation/fb/fbcon.txt | 2 +-
Documentation/fb/viafb.txt | 2 +-
.../filesystems/autofs4-mount-control.txt | 2 +-
Documentation/filesystems/caching/operations.txt | 2 +-
Documentation/kernel-parameters.txt | 2 +-
Documentation/memory-barriers.txt | 2 +-
Documentation/networking/ax25.txt | 2 +-
Documentation/networking/ipvs-sysctl.txt | 2 +-
Documentation/scsi/advansys.txt | 2 +-
Documentation/sysfs-rules.txt | 2 +-
Documentation/trace/ftrace.txt | 2 +-
arch/alpha/kernel/irq_i8259.c | 2 +-
arch/arm/mm/abort-ev7.S | 2 +-
arch/frv/kernel/sleep.S | 2 +-
arch/ia64/hp/sim/simeth.c | 2 +-
arch/ia64/include/asm/sn/pda.h | 2 +-
arch/m68k/kernel/head.S | 6 +++---
arch/m68k/mac/iop.c | 2 +-
arch/microblaze/kernel/signal.c | 2 +-
arch/mips/cavium-octeon/setup.c | 2 +-
arch/mips/include/asm/octeon/octeon.h | 2 +-
arch/powerpc/kernel/ftrace.c | 4 ++--
arch/powerpc/kernel/process.c | 4 ++--
arch/powerpc/kernel/ptrace.c | 2 +-
arch/s390/lib/delay.c | 2 +-
arch/sparc/kernel/head_64.S | 2 +-
arch/x86/boot/compressed/relocs.c | 2 +-
arch/x86/include/asm/xen/hypercall.h | 2 +-
arch/x86/math-emu/reg_u_sub.S | 2 +-
block/cfq-iosched.c | 2 +-
crypto/testmgr.h | 10 +++++-----
crypto/twofish_common.c | 2 +-
drivers/char/amiserial.c | 2 +-
drivers/char/rio/riointr.c | 2 +-
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +-
drivers/gpu/drm/radeon/r300_reg.h | 2 +-
drivers/ieee1394/ieee1394_transactions.c | 4 ++--
drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
drivers/input/serio/hp_sdc.c | 2 +-
drivers/media/dvb/ttpci/av7110.c | 2 +-
drivers/media/video/cx18/cx18-av-core.c | 2 +-
drivers/media/video/hdpvr/hdpvr-video.c | 2 +-
drivers/media/video/ov511.c | 2 +-
drivers/media/video/ovcamchip/ov7x10.c | 2 +-
drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +-
drivers/mtd/ubi/eba.c | 2 +-
drivers/mtd/ubi/vmt.c | 4 ++--
drivers/net/bonding/bond_alb.c | 2 +-
drivers/net/fs_enet/fs_enet.h | 2 +-
drivers/net/ixgbe/ixgbe_82598.c | 2 +-
drivers/net/ixgbe/ixgbe_82599.c | 2 +-
drivers/net/ixgbe/ixgbe_common.c | 2 +-
drivers/net/s2io.c | 2 +-
drivers/net/skfp/fplustm.c | 2 +-
drivers/net/sky2.c | 2 +-
drivers/net/tulip/xircom_cb.c | 4 ++--
drivers/net/wireless/libertas/scan.c | 2 +-
drivers/net/wireless/orinoco/main.h | 2 +-
drivers/parisc/ccio-dma.c | 2 +-
drivers/pci/hotplug/ibmphp.h | 2 +-
drivers/pci/hotplug/shpchp_hpc.c | 2 +-
drivers/rtc/rtc-m41t80.c | 2 +-
drivers/s390/char/sclp.c | 2 +-
drivers/s390/char/tape_34xx.c | 2 +-
drivers/scsi/libfc/fc_fcp.c | 2 +-
drivers/scsi/libiscsi_tcp.c | 2 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 4 ++--
drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +-
drivers/serial/mpsc.c | 2 +-
drivers/spi/amba-pl022.c | 4 ++--
drivers/staging/android/binder.c | 2 +-
drivers/staging/epl/EplObd.c | 2 +-
drivers/staging/frontier/alphatrack.c | 2 +-
drivers/staging/frontier/tranzport.c | 2 +-
.../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +-
drivers/staging/rtl8192su/r8192S_phy.c | 2 +-
drivers/staging/rtl8192su/r819xU_phy.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
drivers/usb/atm/ueagle-atm.c | 2 +-
drivers/usb/wusbcore/crypto.c | 2 +-
drivers/usb/wusbcore/wa-xfer.c | 2 +-
drivers/video/aty/mach64_cursor.c | 2 +-
drivers/video/riva/fbdev.c | 2 +-
drivers/watchdog/eurotechwdt.c | 2 +-
drivers/watchdog/pc87413_wdt.c | 2 +-
drivers/watchdog/w83977f_wdt.c | 2 +-
drivers/watchdog/wdt.c | 2 +-
drivers/watchdog/wdt977.c | 2 +-
drivers/watchdog/wdt_pci.c | 2 +-
fs/bio.c | 2 +-
fs/cifs/inode.c | 2 +-
fs/configfs/dir.c | 2 +-
fs/direct-io.c | 2 +-
fs/exec.c | 2 +-
fs/ext3/inode.c | 2 +-
fs/ext4/inode.c | 2 +-
fs/jbd/checkpoint.c | 2 +-
fs/jbd/journal.c | 2 +-
fs/jbd2/checkpoint.c | 2 +-
fs/jbd2/journal.c | 2 +-
fs/nfs/nfs4xdr.c | 2 +-
fs/ntfs/layout.h | 2 +-
fs/ocfs2/cluster/quorum.c | 2 +-
fs/quota/dquot.c | 2 +-
fs/reiserfs/dir.c | 8 ++++----
fs/squashfs/cache.c | 2 +-
fs/ubifs/io.c | 2 +-
fs/ubifs/misc.h | 2 +-
fs/ufs/super.c | 2 +-
fs/xfs/xfs_trans.c | 2 +-
fs/xfs/xfs_trans_ail.c | 2 +-
include/linux/cgroup.h | 2 +-
include/linux/dmaengine.h | 2 +-
include/linux/exportfs.h | 2 +-
include/linux/ieee80211.h | 2 +-
include/linux/ipv6.h | 2 +-
include/linux/mtd/pfow.h | 2 +-
include/linux/security.h | 2 +-
include/linux/usb/gadget.h | 2 +-
include/linux/wimax/debug.h | 2 +-
include/sound/soc-dai.h | 2 +-
kernel/perf_counter.c | 2 +-
net/atm/lec.c | 2 +-
net/dccp/ipv4.c | 2 +-
net/ipv4/netfilter/nf_nat_pptp.c | 2 +-
net/ipv4/tcp_scalable.c | 2 +-
net/netfilter/nf_conntrack_pptp.c | 2 +-
net/rds/ib_cm.c | 2 +-
net/rds/iw_cm.c | 2 +-
net/sctp/sm_make_chunk.c | 2 +-
net/sunrpc/svcsock.c | 2 +-
net/unix/af_unix.c | 2 +-
scripts/Kbuild.include | 2 +-
scripts/checkpatch.pl | 2 +-
scripts/namespace.pl | 2 +-
sound/isa/cs423x/cs4236_lib.c | 2 +-
sound/isa/es18xx.c | 2 +-
sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +-
tools/perf/Documentation/perf.txt | 2 +-
143 files changed, 159 insertions(+), 159 deletions(-)
Replaced "a a" with "a" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +-
drivers/mtd/ubi/vmt.c | 4 ++--
drivers/net/fs_enet/fs_enet.h | 2 +-
drivers/net/s2io.c | 2 +-
drivers/net/sky2.c | 2 +-
drivers/net/wireless/libertas/scan.c | 2 +-
drivers/video/riva/fbdev.c | 2 +-
include/linux/exportfs.h | 2 +-
include/linux/wimax/debug.h | 2 +-
net/ipv4/netfilter/nf_nat_pptp.c | 2 +-
net/netfilter/nf_conntrack_pptp.c | 2 +-
net/sctp/sm_make_chunk.c | 2 +-
net/sunrpc/svcsock.c | 2 +-
scripts/Kbuild.include | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index cbc3887..e6cf09f 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -5068,7 +5068,7 @@ void pvr2_hdw_status_poll(struct pvr2_hdw *hdw)
/* Note: There apparently is no replacement for VIDIOC_CROPCAP
using v4l2-subdev - therefore we can't support that AT ALL right
now. (Of course, no sub-drivers seem to implement it either.
- But now it's a a chicken and egg problem...) */
+ But now it's a chicken and egg problem...) */
v4l2_device_call_all(&hdw->v4l2_dev, 0, tuner, g_tuner,
&hdw->tuner_signal_info);
pvr2_trace(PVR2_TRACE_CHIPS, "subdev status poll"
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index ab64cb5..f409a7e 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -711,7 +711,7 @@ void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol)
* @ubi: UBI device description object
* @vol_id: volume ID
*
- * Returns zero if volume is all right and a a negative error code if not.
+ * Returns zero if volume is all right and a negative error code if not.
*/
static int paranoid_check_volume(struct ubi_device *ubi, int vol_id)
{
@@ -863,7 +863,7 @@ fail:
* paranoid_check_volumes - check information about all volumes.
* @ubi: UBI device description object
*
- * Returns zero if volumes are all right and a a negative error code if not.
+ * Returns zero if volumes are all right and a negative error code if not.
*/
static int paranoid_check_volumes(struct ubi_device *ubi)
{
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h
index ef01e09..8034d7b 100644
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
@@ -157,7 +157,7 @@ void fs_enet_platform_cleanup(void);
/* access macros */
#if defined(CONFIG_CPM1)
-/* for a a CPM1 __raw_xxx's are sufficient */
+/* for a CPM1 __raw_xxx's are sufficient */
#define __cbd_out32(addr, x) __raw_writel(x, addr)
#define __cbd_out16(addr, x) __raw_writew(x, addr)
#define __cbd_in32(addr) __raw_readl(addr)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 458daa0..aeacc74 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3897,7 +3897,7 @@ static irqreturn_t s2io_test_intr(int irq, void *dev_id)
return IRQ_HANDLED;
}
-/* Test interrupt path by forcing a a software IRQ */
+/* Test interrupt path by forcing a software IRQ */
static int s2io_test_msi(struct s2io_nic *sp)
{
struct pci_dev *pdev = sp->pdev;
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index daf961a..aba800c 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4342,7 +4342,7 @@ static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id)
return IRQ_HANDLED;
}
-/* Test interrupt path by forcing a a software IRQ */
+/* Test interrupt path by forcing a software IRQ */
static int __devinit sky2_test_msi(struct sky2_hw *hw)
{
struct pci_dev *pdev = hw->pdev;
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 601b542..d0e2615 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -502,7 +502,7 @@ void lbs_scan_worker(struct work_struct *work)
/**
* @brief Interpret a BSS scan response returned from the firmware
*
- * Parse the various fixed fields and IEs passed back for a a BSS probe
+ * Parse the various fixed fields and IEs passed back for a BSS probe
* response or beacon from the scan command. Record information as needed
* in the scan table struct bss_descriptor for that entry.
*
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index d94c57f..e4879cc 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1494,7 +1494,7 @@ static inline void convert_bgcolor_16(u32 *col)
* @image: pointer to fb_image structure
*
* DESCRIPTION:
- * If the source is a monochrome bitmap, the function fills up a a region
+ * If the source is a monochrome bitmap, the function fills up a region
* of framebuffer memory with pixels whose color is determined by the bit
* setting of the bitmap, 1 - foreground, 0 - background.
*
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 27e772c..82db618 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -128,7 +128,7 @@ struct fid {
* get_name:
* @get_name should find a name for the given @child in the given @parent
* directory. The name should be stored in the @name (with the
- * understanding that it is already pointing to a a %NAME_MAX+1 sized
+ * understanding that it is already pointing to a %NAME_MAX+1 sized
* buffer. get_name() should return %0 on success, a negative error code
* or error. @get_name will be called without @parent->i_mutex held.
*
diff --git a/include/linux/wimax/debug.h b/include/linux/wimax/debug.h
index c703e03..999e3c8 100644
--- a/include/linux/wimax/debug.h
+++ b/include/linux/wimax/debug.h
@@ -207,7 +207,7 @@ do { \
/*
* CPP sintatic sugar to generate A_B like symbol names when one of
- * the arguments is a a preprocessor #define.
+ * the arguments is a preprocessor #define.
*/
#define __D_PASTE__(varname, modulename) varname##_##modulename
#define __D_PASTE(varname, modulename) (__D_PASTE__(varname, modulename))
diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c
index 9eb1710..371ff2e 100644
--- a/net/ipv4/netfilter/nf_nat_pptp.c
+++ b/net/ipv4/netfilter/nf_nat_pptp.c
@@ -2,7 +2,7 @@
* nf_nat_pptp.c
*
* NAT support for PPTP (Point to Point Tunneling Protocol).
- * PPTP is a a protocol for creating virtual private networks.
+ * PPTP is a protocol for creating virtual private networks.
* It is a specification defined by Microsoft and some vendors
* working with Microsoft. PPTP is built on top of a modified
* version of the Internet Generic Routing Encapsulation Protocol.
diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c
index 3807ac7..dabbc19 100644
--- a/net/netfilter/nf_conntrack_pptp.c
+++ b/net/netfilter/nf_conntrack_pptp.c
@@ -1,6 +1,6 @@
/*
* Connection tracking support for PPTP (Point to Point Tunneling Protocol).
- * PPTP is a a protocol for creating virtual private networks.
+ * PPTP is a protocol for creating virtual private networks.
* It is a specification defined by Microsoft and some vendors
* working with Microsoft. PPTP is built on top of a modified
* version of the Internet Generic Routing Encapsulation Protocol.
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 61cc607..de69e3f 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -2202,7 +2202,7 @@ int sctp_process_init(struct sctp_association *asoc, sctp_cid_t cid,
/* This implementation defaults to making the first transport
* added as the primary transport. The source address seems to
- * be a a better choice than any of the embedded addresses.
+ * be a better choice than any of the embedded addresses.
*/
if (peer_addr) {
if(!sctp_assoc_add_peer(asoc, peer_addr, gfp, SCTP_ACTIVE))
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 23128ee..91e5c92 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -853,7 +853,7 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
*
* rcvbuf just needs to be able to hold a few requests.
* Normally they will be removed from the queue
- * as soon a a complete request arrives.
+ * as soon as a complete request arrives.
*/
svc_sock_setbufsize(svsk->sk_sock,
(serv->sv_nrthreads+3) * serv->sv_max_mesg,
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c29be8f..cc45112 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -210,7 +210,7 @@ if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ), \
$(rule_$(1)))
###
-# why - tell why a a target got build
+# why - tell why a target got build
# enabled by make V=2
# Output (listed in the order they are checked):
# (1) - due to target is PHONY
--
1.6.0.6
Replaced "and and" with "and" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
.../filesystems/autofs4-mount-control.txt | 2 +-
Documentation/networking/ax25.txt | 2 +-
arch/alpha/kernel/irq_i8259.c | 2 +-
arch/m68k/kernel/head.S | 2 +-
arch/m68k/mac/iop.c | 2 +-
arch/powerpc/kernel/ptrace.c | 2 +-
arch/x86/boot/compressed/relocs.c | 2 +-
drivers/gpu/drm/radeon/r300_reg.h | 2 +-
drivers/ieee1394/ieee1394_transactions.c | 4 ++--
drivers/media/video/cx18/cx18-av-core.c | 2 +-
drivers/mtd/ubi/eba.c | 2 +-
drivers/pci/hotplug/shpchp_hpc.c | 2 +-
drivers/s390/char/sclp.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +-
fs/bio.c | 2 +-
fs/nfs/nfs4xdr.c | 2 +-
fs/ubifs/io.c | 2 +-
include/linux/cgroup.h | 2 +-
include/linux/security.h | 2 +-
net/ipv4/tcp_scalable.c | 2 +-
net/unix/af_unix.c | 2 +-
sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +-
22 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt
index 8f78ded..0bffd8b 100644
--- a/Documentation/filesystems/autofs4-mount-control.txt
+++ b/Documentation/filesystems/autofs4-mount-control.txt
@@ -381,7 +381,7 @@ not necessarily at the top of the mounted stack. In this case the path
the descriptor corresponds to is considered a mountpoint if it is itself
a mountpoint or contains a mount, such as a multi-mount without a root
mount. In this case we return 1 if the descriptor corresponds to a mount
-point and and also returns the super magic of the covering mount if there
+point and also returns the super magic of the covering mount if there
is one or 0 if it isn't a mountpoint.
If a path is supplied (and the ioctlfd field is set to -1) then the path
diff --git a/Documentation/networking/ax25.txt b/Documentation/networking/ax25.txt
index 8257dbf..23d6fe8 100644
--- a/Documentation/networking/ax25.txt
+++ b/Documentation/networking/ax25.txt
@@ -1,6 +1,6 @@
To use the amateur radio protocols within Linux you will need to get a
suitable copy of the AX.25 Utilities. More detailed information about
-AX.25, NET/ROM and ROSE, associated programs and and utilities can be
+AX.25, NET/ROM and ROSE, associated programs and utilities can be
found on http://www.linux-ax25.org.
There is an active mailing list for discussing Linux amateur radio matters
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index 50bfec9..07871cc 100644
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -166,7 +166,7 @@ isa_no_iack_sc_device_interrupt(unsigned long vector)
*/
/*
* The first read of gives you *all* interrupting lines.
- * Therefore, read the mask register and and out those lines
+ * Therefore, read the mask register and out those lines
* not enabled. Note that some documentation has 21 and a1
* write only. This is not true.
*/
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 86edb5f..dbf95f6 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -2557,7 +2557,7 @@ func_start mmu_get_root_table_entry,%d0/%a1
/* Find the start of free memory, get_bi_record does this for us,
* as the bootinfo structure is located directly behind the kernel
- * and and we simply search for the last entry.
+ * and we simply search for the last entry.
*/
get_bi_record BI_LAST
addw #PAGESIZE-1,%a0
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c
index 1ad4e9d..59c4cf1 100644
--- a/arch/m68k/mac/iop.c
+++ b/arch/m68k/mac/iop.c
@@ -62,7 +62,7 @@
* a shared memory area in the IOP RAM. Each IOP has seven "channels"; each
* channel is conneced to a specific software driver on the IOP. For example
* on the SCC IOP there is one channel for each serial port. Each channel has
- * an incoming and and outgoing message queue with a depth of one.
+ * an incoming and outgoing message queue with a depth of one.
*
* A message is 32 bytes plus a state byte for the channel (MSG_IDLE, MSG_NEW,
* MSG_RCVD, MSG_COMPLETE). To send a message you copy the message into the
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 9fa2c7d..372a83c 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -353,7 +353,7 @@ static int vr_set(struct task_struct *target, const struct user_regset *regset,
#ifdef CONFIG_VSX
/*
- * Currently to set and and get all the vsx state, you need to call
+ * Currently to set and get all the vsx state, you need to call
* the fp and VMX calls aswell. This only get/sets the lower 32
* 128bit VSX registers.
*/
diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index bbeb0c3..4446541 100644
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
@@ -506,7 +506,7 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
}
if (r_type == R_386_NONE || r_type == R_386_PC32) {
/*
- * NONE can be ignored and and PC relative
+ * NONE can be ignored and PC relative
* relocations don't need to be adjusted.
*/
}
diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h
index 70f4860..7acfbf0 100644
--- a/drivers/gpu/drm/radeon/r300_reg.h
+++ b/drivers/gpu/drm/radeon/r300_reg.h
@@ -1099,7 +1099,7 @@
* The destination register index is in FPI1 (color) and FPI3 (alpha)
* together with enable bits.
* There are separate enable bits for writing into temporary registers
- * (DSTC_REG_* /DSTA_REG) and and program output registers (DSTC_OUTPUT_*
+ * (DSTC_REG_* /DSTA_REG) and program output registers (DSTC_OUTPUT_*
* /DSTA_OUTPUT). You can write to both at once, or not write at all (the
* same index must be used for both).
*
diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c
index 675b313..92e4928 100644
--- a/drivers/ieee1394/ieee1394_transactions.c
+++ b/drivers/ieee1394/ieee1394_transactions.c
@@ -486,7 +486,7 @@ struct hpsb_packet *hpsb_make_phypacket(struct hpsb_host *host, quadlet_t data)
* hpsb_read - generic read function
*
* Recognizes the local node ID and act accordingly. Automatically uses a
- * quadlet read request if @length == 4 and and a block read request otherwise.
+ * quadlet read request if @length == 4 and a block read request otherwise.
* It does not yet support lengths that are not a multiple of 4.
*
* You must explicitly specifiy the @generation for which the node ID is valid,
@@ -533,7 +533,7 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation,
* hpsb_write - generic write function
*
* Recognizes the local node ID and act accordingly. Automatically uses a
- * quadlet write request if @length == 4 and and a block write request
+ * quadlet write request if @length == 4 and a block write request
* otherwise. It does not yet support lengths that are not a multiple of 4.
*
* You must explicitly specifiy the @generation for which the node ID is valid,
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index 536dedb..87d815e 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -197,7 +197,7 @@ static void cx18_av_initialize(struct v4l2_subdev *sd)
*/
cx18_av_and_or4(cx, CXADEC_CHIP_CTRL, 0xFFFBFFFF, 0x00120000);
- /* Setup the Video and and Aux/Audio PLLs */
+ /* Setup the Video and Aux/Audio PLLs */
cx18_av_init(sd, 0);
/* set video to auto-detect */
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 0f2034c..64c0167 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -263,7 +263,7 @@ static int leb_write_lock(struct ubi_device *ubi, int vol_id, int lnum)
*
* This function locks a logical eraseblock for writing if there is no
* contention and does nothing if there is contention. Returns %0 in case of
- * success, %1 in case of contention, and and a negative error code in case of
+ * success, %1 in case of contention, and a negative error code in case of
* failure.
*/
static int leb_write_trylock(struct ubi_device *ubi, int vol_id, int lnum)
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 86dc398..003689e 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -319,7 +319,7 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)
mutex_lock(&slot->ctrl->cmd_lock);
if (!shpc_poll_ctrl_busy(ctrl)) {
- /* After 1 sec and and the controller is still busy */
+ /* After 1 sec and the controller is still busy */
ctrl_err(ctrl, "Controller is still busy after 1 sec\n");
retval = -EBUSY;
goto out;
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index a983f50..0ce4e0e 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -43,7 +43,7 @@ static struct list_head sclp_reg_list;
/* List of queued requests. */
static struct list_head sclp_req_queue;
-/* Data for read and and init requests. */
+/* Data for read and init requests. */
static struct sclp_req sclp_read_req;
static struct sclp_req sclp_init_req;
static char sclp_read_sccb[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 297deb8..905577f 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -5059,7 +5059,7 @@ static void sym_alloc_lcb_tags (struct sym_hcb *np, u_char tn, u_char ln)
int i;
/*
- * Allocate the task table and and the tag allocation
+ * Allocate the task table and the tag allocation
* circular buffer. We want both or none.
*/
lp->itlq_tbl = sym_calloc_dma(SYM_CONF_MAX_TASK*4, "ITLQ_TBL");
diff --git a/fs/bio.c b/fs/bio.c
index 1486b19..597b487 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1382,7 +1382,7 @@ void bio_check_pages_dirty(struct bio *bio)
* Description:
* bio_endio() will end I/O on the whole bio. bio_endio() is the
* preferred way to end I/O on a bio, it takes care of clearing
- * BIO_UPTODATE on error. @error is 0 on success, and and one of the
+ * BIO_UPTODATE on error. @error is 0 on success, and one of the
* established -Exxxx (-EIO, for instance) error values in case
* something went wrong. Noone should call bi_end_io() directly on a
* bio unless they own it and thus know that it has an end_io
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 617273e..44b6361 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -4008,7 +4008,7 @@ static int decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req)
* The XDR encode routine has set things up so that
* the link text will be copied directly into the
* buffer. We just have to do overflow-checking,
- * and and null-terminate the text (the VFS expects
+ * and null-terminate the text (the VFS expects
* null-termination).
*/
kaddr = (char *)kmap_atomic(rcvbuf->pages[0], KM_USER0);
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index bc58571..26cb583 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -764,7 +764,7 @@ out:
* @lnum: logical eraseblock number
* @offs: offset within the logical eraseblock
*
- * This function reads a node of known type and and length, checks it and
+ * This function reads a node of known type and length, checks it and
* stores in @buf. Returns zero in case of success, %-EUCLEAN if CRC mismatched
* and a negative error code in case of failure.
*/
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 665fa70..ea49c26 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -59,7 +59,7 @@ struct cgroup_subsys_state {
/*
* State maintained by the cgroup system to allow subsystems
* to be "busy". Should be accessed via css_get(),
- * css_tryget() and and css_put().
+ * css_tryget() and css_put().
*/
atomic_t refcnt;
diff --git a/include/linux/security.h b/include/linux/security.h
index 5eff459..11095ac 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -845,7 +845,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
* structure. Note that the security field was not added directly to the
* socket structure, but rather, the socket security information is stored
* in the associated inode. Typically, the inode alloc_security hook will
- * allocate and and attach security information to
+ * allocate and attach security information to
* sock->inode->i_security. This hook may be used to update the
* sock->inode->i_security field with additional information that wasn't
* available when the inode was allocated.
diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c
index a765137..e58931d 100644
--- a/net/ipv4/tcp_scalable.c
+++ b/net/ipv4/tcp_scalable.c
@@ -9,7 +9,7 @@
#include <net/tcp.h>
/* These factors derived from the recommended values in the aer:
- * .01 and and 7/8. We use 50 instead of 100 to account for
+ * .01 and 7/8. We use 50 instead of 100 to account for
* delayed ack.
*/
#define TCP_SCALABLE_AI_CNT 50U
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 36d4e44..5335cb7 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1164,7 +1164,7 @@ restart:
unix_state_unlock(sk);
- /* take ten and and send info to listening sock */
+ /* take ten and send info to listening sock */
spin_lock(&other->sk_receive_queue.lock);
__skb_queue_tail(&other->sk_receive_queue, skb);
spin_unlock(&other->sk_receive_queue.lock);
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index dd7c41b..7c3ad81 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -1726,7 +1726,7 @@ int cs46xx_iec958_pre_open (struct snd_cs46xx *chip)
struct dsp_spos_instance * ins = chip->dsp_spos_instance;
if ( ins->spdif_status_out & DSP_SPDIF_STATUS_OUTPUT_ENABLED ) {
- /* remove AsynchFGTxSCB and and PCMSerialInput_II */
+ /* remove AsynchFGTxSCB and PCMSerialInput_II */
cs46xx_dsp_disable_spdif_out (chip);
/* save state */
--
1.6.0.6
Replaced "are are" with "are" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
drivers/serial/mpsc.c | 2 +-
drivers/staging/epl/EplObd.c | 2 +-
drivers/usb/wusbcore/crypto.c | 2 +-
fs/reiserfs/dir.c | 8 ++++----
scripts/checkpatch.pl | 2 +-
tools/perf/Documentation/perf.txt | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 2317398..6160768 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -143,7 +143,7 @@ static int ipath_get_base_info(struct file *fp,
kinfo->spi_tidcnt += dd->ipath_rcvtidcnt % subport_cnt;
/*
* for this use, may be ipath_cfgports summed over all chips that
- * are are configured and present
+ * are configured and present
*/
kinfo->spi_nports = dd->ipath_cfgports;
/* unit (chip/board) our port is on */
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 61d3ade..d2be2ef 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -114,7 +114,7 @@ struct mpsc_tx_desc {
} __attribute((packed));
/*
- * Some regs that have the erratum that you can't read them are are shared
+ * Some regs that have the erratum that you can't read them are shared
* between the two MPSC controllers. This struct contains those shared regs.
*/
struct mpsc_shared_regs {
diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c
index 1e46323..921997c 100644
--- a/drivers/staging/epl/EplObd.c
+++ b/drivers/staging/epl/EplObd.c
@@ -3171,7 +3171,7 @@ void *EplObdGetObjectDataPtrIntern(tEplObdSubEntryPtr pSubindexEntry_p)
ASSERTMSG(pSubindexEntry_p != NULL,
"EplObdGetObjectDataPtrIntern(): pointer to SubEntry not valid!\n");
- // there are are some objects whose data pointer has to get from other structure
+ // there are some objects whose data pointer has to get from other structure
// get access type for this object
Access = pSubindexEntry_p->m_Access;
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c
index 9ec7fd5..db3063f 100644
--- a/drivers/usb/wusbcore/crypto.c
+++ b/drivers/usb/wusbcore/crypto.c
@@ -22,7 +22,7 @@
*
* We don't do any encryption here; we use the Linux Kernel's AES-128
* crypto modules to construct keys and payload blocks in a way
- * defined by WUSB1.0[6]. Check the erratas, as typos are are patched
+ * defined by WUSB1.0[6]. Check the erratas, as typos are patched
* there.
*
* Thanks a zillion to John Keys for his help and clarifications over
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index 6d2668f..8ecfdff 100644
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -247,7 +247,7 @@ void make_empty_dir_item_v1(char *body, __le32 dirid, __le32 objid,
/* direntry header of "." */
put_deh_offset(&(deh[0]), DOT_OFFSET);
- /* these two are from make_le_item_head, and are are LE */
+ /* these two are from make_le_item_head, and are LE */
deh[0].deh_dir_id = dirid;
deh[0].deh_objectid = objid;
deh[0].deh_state = 0; /* Endian safe if 0 */
@@ -257,7 +257,7 @@ void make_empty_dir_item_v1(char *body, __le32 dirid, __le32 objid,
/* direntry header of ".." */
put_deh_offset(&(deh[1]), DOT_DOT_OFFSET);
/* key of ".." for the root directory */
- /* these two are from the inode, and are are LE */
+ /* these two are from the inode, and are LE */
deh[1].deh_dir_id = par_dirid;
deh[1].deh_objectid = par_objid;
deh[1].deh_state = 0; /* Endian safe if 0 */
@@ -280,7 +280,7 @@ void make_empty_dir_item(char *body, __le32 dirid, __le32 objid,
/* direntry header of "." */
put_deh_offset(&(deh[0]), DOT_OFFSET);
- /* these two are from make_le_item_head, and are are LE */
+ /* these two are from make_le_item_head, and are LE */
deh[0].deh_dir_id = dirid;
deh[0].deh_objectid = objid;
deh[0].deh_state = 0; /* Endian safe if 0 */
@@ -290,7 +290,7 @@ void make_empty_dir_item(char *body, __le32 dirid, __le32 objid,
/* direntry header of ".." */
put_deh_offset(&(deh[1]), DOT_DOT_OFFSET);
/* key of ".." for the root directory */
- /* these two are from the inode, and are are LE */
+ /* these two are from the inode, and are LE */
deh[1].deh_dir_id = par_dirid;
deh[1].deh_objectid = par_objid;
deh[1].deh_state = 0; /* Endian safe if 0 */
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2d5ece7..960cea8 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2580,7 +2580,7 @@ sub process {
exit(0);
}
- # This is not a patch, and we are are in 'no-patch' mode so
+ # This is not a patch, and we are in 'no-patch' mode so
# just keep quiet.
if (!$chk_patch && !$is_patch) {
exit(0);
diff --git a/tools/perf/Documentation/perf.txt b/tools/perf/Documentation/perf.txt
index 69c8325..0eeb247 100644
--- a/tools/perf/Documentation/perf.txt
+++ b/tools/perf/Documentation/perf.txt
@@ -12,7 +12,7 @@ SYNOPSIS
DESCRIPTION
-----------
-Performance counters for Linux are are a new kernel-based subsystem
+Performance counters for Linux are a new kernel-based subsystem
that provide a framework for all things performance analysis. It
covers hardware level (CPU/PMU, Performance Monitoring Unit) features
and software features (software counters, tracepoints) as well.
--
1.6.0.6
Replaced "as as" with "as" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/mips/cavium-octeon/setup.c | 2 +-
arch/mips/include/asm/octeon/octeon.h | 2 +-
arch/x86/include/asm/xen/hypercall.h | 2 +-
fs/squashfs/cache.c | 2 +-
fs/ubifs/misc.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index da55924..acb7aae 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -346,7 +346,7 @@ void octeon_user_io_init(void)
/* Get the current settings for CP0_CVMMEMCTL_REG */
cvmmemctl.u64 = read_c0_cvmmemctl();
/* R/W If set, marked write-buffer entries time out the same
- * as as other entries; if clear, marked write-buffer entries
+ * as other entries; if clear, marked write-buffer entries
* use the maximum timeout. */
cvmmemctl.s.dismarkwblongto = 1;
/* R/W If set, a merged store does not clear the write-buffer
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index cac9b1a..7fb9431 100644
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -125,7 +125,7 @@ union octeon_cvmemctl {
/* Reserved */
uint64_t reserved:22;
/* R/W If set, marked write-buffer entries time out
- * the same as as other entries; if clear, marked
+ * the same as other entries; if clear, marked
* write-buffer entries use the maximum timeout. */
uint64_t dismarkwblongto:1;
/* R/W If set, a merged store does not clear the
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index 9c371e4..4ef2ec5 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -74,7 +74,7 @@
* - clobber the rest
*
* The result certainly isn't pretty, and it really shows up cpp's
- * weakness as as macro language. Sorry. (But let's just give thanks
+ * weakness as macro language. Sorry. (But let's just give thanks
* there aren't more than 5 arguments...)
*/
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c
index 40c98fa..30c072e 100644
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@ -35,7 +35,7 @@
* It should be noted that the cache is not used for file datablocks, these
* are decompressed and cached in the page-cache in the normal way. The
* cache is only used to temporarily cache fragment and metadata blocks
- * which have been read as as a result of a metadata (i.e. inode or
+ * which have been read as a result of a metadata (i.e. inode or
* directory) or fragment access. Because metadata and fragments are packed
* together into blocks (to gain greater compression) the read of a particular
* piece of metadata or fragment will retrieve other metadata/fragments which
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index 4fa81d8..191fb16 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -108,7 +108,7 @@ static inline const char *ubifs_compr_name(int compr_type)
* ubifs_wbuf_sync - synchronize write-buffer.
* @wbuf: write-buffer to synchronize
*
- * This is the same as as 'ubifs_wbuf_sync_nolock()' but it does not assume
+ * This is the same as 'ubifs_wbuf_sync_nolock()' but it does not assume
* that the write-buffer is already locked.
*/
static inline int ubifs_wbuf_sync(struct ubifs_wbuf *wbuf)
--
1.6.0.6
Replaced "be be" with "be" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
Documentation/filesystems/caching/operations.txt | 2 +-
Documentation/scsi/advansys.txt | 2 +-
arch/frv/kernel/sleep.S | 2 +-
arch/x86/math-emu/reg_u_sub.S | 2 +-
drivers/pci/hotplug/ibmphp.h | 2 +-
drivers/staging/frontier/alphatrack.c | 2 +-
drivers/staging/frontier/tranzport.c | 2 +-
drivers/video/aty/mach64_cursor.c | 2 +-
include/sound/soc-dai.h | 2 +-
sound/isa/es18xx.c | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/filesystems/caching/operations.txt b/Documentation/filesystems/caching/operations.txt
index b6b070c..18f3f98 100644
--- a/Documentation/filesystems/caching/operations.txt
+++ b/Documentation/filesystems/caching/operations.txt
@@ -26,7 +26,7 @@ data storage and retrieval routines. Its operations are represented by
fscache_operation structs, though these are usually embedded into some other
structure.
-This facility is available to and expected to be be used by the cache backends,
+This facility is available to and expected to be used by the cache backends,
and FS-Cache will create operations and pass them off to the appropriate cache
backend for completion.
diff --git a/Documentation/scsi/advansys.txt b/Documentation/scsi/advansys.txt
index 4a3db62..a80067f 100644
--- a/Documentation/scsi/advansys.txt
+++ b/Documentation/scsi/advansys.txt
@@ -114,7 +114,7 @@ The following constants can be defined in the source file.
c. klogd is started with the appropriate -c parameter
(e.g. klogd -c 8)
- This will cause printk() messages to be be displayed on the
+ This will cause printk() messages to be displayed on the
current console. Refer to the klogd(8) and syslogd(8) man pages
for details.
diff --git a/arch/frv/kernel/sleep.S b/arch/frv/kernel/sleep.S
index f67bf73..0fae422 100644
--- a/arch/frv/kernel/sleep.S
+++ b/arch/frv/kernel/sleep.S
@@ -123,7 +123,7 @@ frv_cpu_suspend:
#
# the final part of the sleep sequence...
-# - we want it to be be cacheline aligned so we can lock it into the icache easily
+# - we want it to be cacheline aligned so we can lock it into the icache easily
# On entry: gr7 holds desired hsr0 sleep value
# gr8 holds desired psr sleep value
#
diff --git a/arch/x86/math-emu/reg_u_sub.S b/arch/x86/math-emu/reg_u_sub.S
index 1b6c248..5c55c8a 100644
--- a/arch/x86/math-emu/reg_u_sub.S
+++ b/arch/x86/math-emu/reg_u_sub.S
@@ -49,7 +49,7 @@ ENTRY(FPU_u_sub)
/* source 2 is always smaller than source 1 */
js L_bugged_1
- testl $0x80000000,SIGH(%edi) /* The args are assumed to be be normalized */
+ testl $0x80000000,SIGH(%edi) /* The args are assumed to be normalized */
je L_bugged_2
testl $0x80000000,SIGH(%esi)
diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h
index a8d391a..f964979 100644
--- a/drivers/pci/hotplug/ibmphp.h
+++ b/drivers/pci/hotplug/ibmphp.h
@@ -751,7 +751,7 @@ struct controller {
extern int ibmphp_init_devno (struct slot **); /* This function is called from EBDA, so we need it not be static */
extern int ibmphp_do_disable_slot (struct slot *slot_cur);
-extern int ibmphp_update_slot_info (struct slot *); /* This function is called from HPC, so we need it to not be be static */
+extern int ibmphp_update_slot_info (struct slot *); /* This function is called from HPC, so we need it to not be static */
extern int ibmphp_configure_card (struct pci_func *, u8);
extern int ibmphp_unconfigure_card (struct slot **, int);
extern struct hotplug_slot_ops ibmphp_hotplug_slot_ops;
diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index 15aed87..1e8d0ad 100644
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -599,7 +599,7 @@ static ssize_t usb_alphatrack_write(struct file *file,
}
if (dev->interrupt_out_endpoint == NULL) {
- err("Endpoint should not be be null! \n");
+ err("Endpoint should not be null! \n");
goto unlock_exit;
}
diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index ef8fcc8..fda8fff 100644
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -724,7 +724,7 @@ static ssize_t usb_tranzport_write(struct file *file,
}
if (dev->interrupt_out_endpoint == NULL) {
- err("Endpoint should not be be null! \n");
+ err("Endpoint should not be null! \n");
goto unlock_exit;
}
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index 04c7108..959e03b 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -45,7 +45,7 @@
* The Screen position of the top left corner of the displayed
* cursor is specificed by CURS_HORZ_VERT_POSN. Care must be taken
* when the cursor hot spot is not the top left corner and the
- * physical cursor position becomes negative. It will be be displayed
+ * physical cursor position becomes negative. It will be displayed
* if either the horizontal or vertical cursor position is negative
*
* If x becomes negative the cursor manager must adjust the CURS_HORZ_OFFSET
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 352d7ee..e391533 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -38,7 +38,7 @@ struct snd_pcm_substream;
/*
* DAI Clock gating.
*
- * DAI bit clocks can be be gated (disabled) when not the DAI is not
+ * DAI bit clocks can be gated (disabled) when not the DAI is not
* sending or receiving PCM data in a frame. This can be used to save power.
*/
#define SND_SOC_DAIFMT_CONT (0 << 4) /* continuous clock */
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 8cfbff7..be99fc7 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -1003,7 +1003,7 @@ static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_ele
uinfo->value.enumerated.item = 4;
strcpy(uinfo->value.enumerated.name, texts5Source[uinfo->value.enumerated.item]);
break;
- case 0x1869: /* DS somewhat contradictory for 1869: could be be 5 or 8 */
+ case 0x1869: /* DS somewhat contradictory for 1869: could be 5 or 8 */
case 0x1879:
uinfo->value.enumerated.items = 8;
if (uinfo->value.enumerated.item > 7)
--
1.6.0.6
Replaced "can can" with "can"
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
include/linux/mtd/pfow.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/mtd/pfow.h b/include/linux/mtd/pfow.h
index b730d4f..97df931 100644
--- a/include/linux/mtd/pfow.h
+++ b/include/linux/mtd/pfow.h
@@ -18,7 +18,7 @@
/* Identification info for LPDDR chip */
#define PFOW_MANUFACTURER_ID 0x0020
#define PFOW_DEVICE_ID 0x0022
-/* Address in PFOW where prog buffer can can be found */
+/* Address in PFOW where prog buffer can be found */
#define PFOW_PROGRAM_BUFFER_OFFSET 0x0040
/* Size of program buffer in words */
#define PFOW_PROGRAM_BUFFER_SIZE 0x0042
--
1.6.0.6
Replaced "bit bit" with "bit" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
drivers/staging/rtl8192su/r8192S_phy.c | 2 +-
drivers/staging/rtl8192su/r819xU_phy.c | 2 +-
sound/isa/cs423x/cs4236_lib.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192su/r8192S_phy.c b/drivers/staging/rtl8192su/r8192S_phy.c
index 99a4051..b5f6aa5 100644
--- a/drivers/staging/rtl8192su/r8192S_phy.c
+++ b/drivers/staging/rtl8192su/r8192S_phy.c
@@ -1301,7 +1301,7 @@ phy_RFSerialWrite(struct net_device* dev,RF90_RADIO_PATH_E eRFPath,u32 Offset,u3
* u32 BitMask,
*
* Output: none
-* Return: u32 Return the shift bit bit position of the mask
+* Return: u32 Return the shift bit position of the mask
*/
//use in phy only
static u32 phy_CalculateBitShift(u32 BitMask)
diff --git a/drivers/staging/rtl8192su/r819xU_phy.c b/drivers/staging/rtl8192su/r819xU_phy.c
index 00497d3..cbc922c 100644
--- a/drivers/staging/rtl8192su/r819xU_phy.c
+++ b/drivers/staging/rtl8192su/r819xU_phy.c
@@ -42,7 +42,7 @@ static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
* and do register read/write
* input: u32 dwBitMask //taget bit pos in the addr to be modified
* output: none
- * return: u32 return the shift bit bit position of the mask
+ * return: u32 return the shift bit position of the mask
* ****************************************************************************/
u32 rtl8192_CalculateBitShift(u32 dwBitMask)
{
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 38835f3..8109b4b 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -53,7 +53,7 @@
* D7: consumer serial port enable (CS4237B,CS4238B)
* D6: channels status block reset (CS4237B,CS4238B)
* D5: user bit in sub-frame of digital audio data (CS4237B,CS4238B)
- * D4: validity bit bit in sub-frame of digital audio data (CS4237B,CS4238B)
+ * D4: validity bit in sub-frame of digital audio data (CS4237B,CS4238B)
*
* C5 lower channel status (digital serial data description) (CS4237B,CS4238B)
* D7-D6: first two bits of category code
--
1.6.0.6
Replaced "by by" with "by" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
drivers/media/video/ov511.c | 2 +-
drivers/media/video/ovcamchip/ov7x10.c | 2 +-
include/linux/ipv6.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 0bc2cf5..118de90 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -4,7 +4,7 @@
* Copyright (c) 1999-2003 Mark W. McClelland
* Original decompression code Copyright 1998-2000 OmniVision Technologies
* Many improvements by Bret Wallach <[email protected]>
- * Color fixes by by Orion Sky Lawlor <[email protected]> (2/26/2000)
+ * Color fixes by Orion Sky Lawlor <[email protected]> (2/26/2000)
* Snapshot code by Kevin Moore
* OV7620 fixes by Charl P. Botha <[email protected]>
* Changes by Claudio Matsuoka <[email protected]>
diff --git a/drivers/media/video/ovcamchip/ov7x10.c b/drivers/media/video/ovcamchip/ov7x10.c
index 5206e79..3d48820 100644
--- a/drivers/media/video/ovcamchip/ov7x10.c
+++ b/drivers/media/video/ovcamchip/ov7x10.c
@@ -3,7 +3,7 @@
* Copyright (c) 1999-2004 Mark McClelland <[email protected]>
* http://alpha.dyndns.org/ov511/
*
- * Color fixes by by Orion Sky Lawlor <[email protected]> (2/26/2000)
+ * Color fixes by Orion Sky Lawlor <[email protected]> (2/26/2000)
*
* 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 the
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c662efa..cf7d7cf 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -296,7 +296,7 @@ struct ipv6_pinfo {
/*
* Packed in 16bits.
- * Omit one shift by by putting the signed field at MSB.
+ * Omit one shift by putting the signed field at MSB.
*/
#if defined(__BIG_ENDIAN_BITFIELD)
__s16 hop_limit:9;
--
1.6.0.6
Replaced "could could" with "could" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
net/rds/ib_cm.c | 2 +-
net/rds/iw_cm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index f8e40e1..42268a9 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -354,7 +354,7 @@ static u32 rds_ib_protocol_compatible(const struct rds_ib_connect_private *dp)
* original size. The only way to tell the difference is by looking at
* the contents, which are initialized to zero.
* If the protocol version fields aren't set, this is a connection attempt
- * from an older version. This could could be 3.0 or 2.0 - we can't tell.
+ * from an older version. This could be 3.0 or 2.0 - we can't tell.
* We really should have changed this for OFED 1.3 :-( */
if (dp->dp_protocol_major == 0)
return RDS_PROTOCOL_3_0;
diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
index a416b0d..784558e 100644
--- a/net/rds/iw_cm.c
+++ b/net/rds/iw_cm.c
@@ -352,7 +352,7 @@ static u32 rds_iw_protocol_compatible(const struct rds_iw_connect_private *dp)
* original size. The only way to tell the difference is by looking at
* the contents, which are initialized to zero.
* If the protocol version fields aren't set, this is a connection attempt
- * from an older version. This could could be 3.0 or 2.0 - we can't tell.
+ * from an older version. This could be 3.0 or 2.0 - we can't tell.
* We really should have changed this for OFED 1.3 :-( */
if (dp->dp_protocol_major == 0)
return RDS_PROTOCOL_3_0;
--
1.6.0.6
Replaced "from from" with "from" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/sparc/kernel/head_64.S | 2 +-
crypto/testmgr.h | 10 +++++-----
drivers/net/ixgbe/ixgbe_82598.c | 2 +-
drivers/net/ixgbe/ixgbe_82599.c | 2 +-
drivers/net/ixgbe/ixgbe_common.c | 2 +-
drivers/scsi/libfc/fc_fcp.c | 2 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
.../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
fs/exec.c | 2 +-
fs/jbd/journal.c | 2 +-
fs/jbd2/journal.c | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index f8f2105..711dd11 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -33,7 +33,7 @@
#include <asm/sfafsr.h>
#include <asm/unistd.h>
-/* This section from from _start to sparc64_boot_end should fit into
+/* This section from _start to sparc64_boot_end should fit into
* 0x0000000000404000 to 0x0000000000408000.
*/
.text
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index 6931622..07500f1 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -441,7 +441,7 @@ static struct hash_testvec rmd320_tv_template[] = {
};
/*
- * SHA1 test vectors from from FIPS PUB 180-1
+ * SHA1 test vectors from FIPS PUB 180-1
*/
#define SHA1_TEST_VECTORS 2
@@ -463,7 +463,7 @@ static struct hash_testvec sha1_tv_template[] = {
/*
- * SHA224 test vectors from from FIPS PUB 180-2
+ * SHA224 test vectors from FIPS PUB 180-2
*/
#define SHA224_TEST_VECTORS 2
@@ -489,7 +489,7 @@ static struct hash_testvec sha224_tv_template[] = {
};
/*
- * SHA256 test vectors from from NIST
+ * SHA256 test vectors from NIST
*/
#define SHA256_TEST_VECTORS 2
@@ -514,7 +514,7 @@ static struct hash_testvec sha256_tv_template[] = {
};
/*
- * SHA384 test vectors from from NIST and kerneli
+ * SHA384 test vectors from NIST and kerneli
*/
#define SHA384_TEST_VECTORS 4
@@ -563,7 +563,7 @@ static struct hash_testvec sha384_tv_template[] = {
};
/*
- * SHA512 test vectors from from NIST and kerneli
+ * SHA512 test vectors from NIST and kerneli
*/
#define SHA512_TEST_VECTORS 4
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index b992304..b35e45c 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -705,7 +705,7 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
no_phy_reset:
/*
- * Prevent the PCI-E bus from from hanging by disabling PCI-E master
+ * Prevent the PCI-E bus from hanging by disabling PCI-E master
* access and verify no pending requests before reset
*/
status = ixgbe_disable_pcie_master(hw);
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 1984cab..aea90a5 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -848,7 +848,7 @@ s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
hw->phy.ops.reset(hw);
/*
- * Prevent the PCI-E bus from from hanging by disabling PCI-E master
+ * Prevent the PCI-E bus from hanging by disabling PCI-E master
* access and verify no pending requests before reset
*/
status = ixgbe_disable_pcie_master(hw);
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 96a1859..7cbfd4d 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -373,7 +373,7 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw)
}
/*
- * Prevent the PCI-E bus from from hanging by disabling PCI-E master
+ * Prevent the PCI-E bus from hanging by disabling PCI-E master
* access and verify no pending requests
*/
if (ixgbe_disable_pcie_master(hw) != 0)
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index e303e0d..ea04822 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -185,7 +185,7 @@ static void fc_fcp_pkt_hold(struct fc_fcp_pkt *fsp)
*
* Release hold on scsi_pkt packet set to keep scsi_pkt
* till EM layer exch resource is not freed.
- * Context : called from from EM layer.
+ * Context : called from EM layer.
* no locking required
*/
static void fc_fcp_pkt_destroy(struct fc_seq *seq, void *fsp)
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 8d0f0de..5384f9b 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -1085,7 +1085,7 @@ lpfc_debugfs_lseek(struct file *file, loff_t off, int whence)
* @ppos: The position in the file to start reading from.
*
* Description:
- * This routine reads data from from the buffer indicated in the private_data
+ * This routine reads data from the buffer indicated in the private_data
* field of @file. It will start reading at @ppos and copy up to @nbytes of
* data to @buf.
*
diff --git a/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c
index f357085..538a192 100644
--- a/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c
@@ -1685,7 +1685,7 @@ void HTGetValueFromBeaconOrProbeRsp(
//
// 2008/01/25 MH Get Broadcom AP IE for manamgent frame CCK rate problem.
- // AP can not receive CCK managemtn from from 92E.
+ // AP can not receive CCK managemtn from 92E.
//
// Initialize every new bss broadcom cap exist as false..
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index f493cf4..c6a30a7 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1382,7 +1382,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* we get back in range. We should block transmits and
* receives in this state. Do we need an indication here?
* Probably not since a polling user-mode element would
- * get this status from from p2PortStatus(FD40). What about
+ * get this status from p2PortStatus(FD40). What about
* p80211?
* Response:
* Block Transmits, Ignore receives of data frames
diff --git a/fs/exec.c b/fs/exec.c
index 4a8849e..591d0f0 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -101,7 +101,7 @@ static inline void put_binfmt(struct linux_binfmt * fmt)
* Note that a shared library must be both readable and executable due to
* security reasons.
*
- * Also note that we take the address to load from from the file itself.
+ * Also note that we take the address to load from the file itself.
*/
SYSCALL_DEFINE1(uselib, const char __user *, library)
{
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 737f724..bffa2f2 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -654,7 +654,7 @@ struct journal_head *journal_get_descriptor_buffer(journal_t *journal)
/* First: create and setup a journal_t object in memory. We initialise
* very few fields yet: that has to wait until we have created the
- * journal structures from from scratch, or loaded them from disk. */
+ * journal structures from scratch, or loaded them from disk. */
static journal_t * journal_init_common (void)
{
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 18bfd5d..be122e7 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -970,7 +970,7 @@ static void journal_init_stats(journal_t *journal)
/* First: create and setup a journal_t object in memory. We initialise
* very few fields yet: that has to wait until we have created the
- * journal structures from from scratch, or loaded them from disk. */
+ * journal structures from scratch, or loaded them from disk. */
static journal_t * journal_init_common (void)
{
--
1.6.0.6
Replaced "on on" with "on" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
Documentation/fb/fbcon.txt | 2 +-
arch/arm/mm/abort-ev7.S | 2 +-
drivers/spi/amba-pl022.c | 4 ++--
fs/quota/dquot.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt
index 99ea58e..4a9739a 100644
--- a/Documentation/fb/fbcon.txt
+++ b/Documentation/fb/fbcon.txt
@@ -150,7 +150,7 @@ C. Boot options
C. Attaching, Detaching and Unloading
-Before going on on how to attach, detach and unload the framebuffer console, an
+Before going on how to attach, detach and unload the framebuffer console, an
illustration of the dependencies may help.
The console layer, as with most subsystems, needs a driver that interfaces with
diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S
index 2e6dc04..057e3b7 100644
--- a/arch/arm/mm/abort-ev7.S
+++ b/arch/arm/mm/abort-ev7.S
@@ -17,7 +17,7 @@
.align 5
ENTRY(v7_early_abort)
/*
- * The effect of data aborts on on the exclusive access monitor are
+ * The effect of data aborts on the exclusive access monitor are
* UNPREDICTABLE. Do a CLREX to clear the state
*/
clrex
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index da76797..d641b94 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -283,7 +283,7 @@
/*
- * The type of reading going on on this chip
+ * The type of reading going on this chip
*/
enum ssp_reading {
READING_NULL,
@@ -293,7 +293,7 @@ enum ssp_reading {
};
/**
- * The type of writing going on on this chip
+ * The type of writing going on this chip
*/
enum ssp_writing {
WRITING_NULL,
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 607c579..04a1da9 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1998,7 +1998,7 @@ int vfs_quota_off(struct super_block *sb, int type, int remount)
}
EXPORT_SYMBOL(vfs_quota_off);
/*
- * Turn quotas on on a device
+ * Turn quotas on a device
*/
/*
--
1.6.0.6
Replaced "lock lock" with "lock"
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
fs/ufs/super.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 5faed79..a19c068 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -401,7 +401,7 @@ static int ufs_parse_options (char * options, unsigned * mount_options)
break;
case Opt_onerror_repair:
printk("UFS-fs: Unable to do repair on error, "
- "will lock lock instead\n");
+ "will lock instead\n");
ufs_clear_opt (*mount_options, ONERROR);
ufs_set_opt (*mount_options, ONERROR_REPAIR);
break;
--
1.6.0.6
Replaced "has has" with "has" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
drivers/scsi/libiscsi_tcp.c | 2 +-
include/linux/dmaengine.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 2e0746d..af99baf 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -545,7 +545,7 @@ static int iscsi_tcp_r2t_rsp(struct iscsi_conn *conn, struct iscsi_task *task)
if (!rc) {
iscsi_conn_printk(KERN_ERR, conn, "Could not allocate R2T. "
"Target has sent more R2Ts than it "
- "negotiated for or driver has has leaked.\n");
+ "negotiated for or driver has leaked.\n");
return ISCSI_ERR_PROTO;
}
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index ffefba8..3e69257 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -74,7 +74,7 @@ enum dma_transaction_type {
* @DMA_PREP_INTERRUPT - trigger an interrupt (callback) upon completion of
* this transaction
* @DMA_CTRL_ACK - the descriptor cannot be reused until the client
- * acknowledges receipt, i.e. has has a chance to establish any
+ * acknowledges receipt, i.e. has a chance to establish any
* dependency chains
* @DMA_COMPL_SKIP_SRC_UNMAP - set to disable dma-unmapping the source buffer(s)
* @DMA_COMPL_SKIP_DEST_UNMAP - set to disable dma-unmapping the destination(s)
--
1.6.0.6
Replaced "too too" with "too"
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
net/dccp/ipv4.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index a0a36c9..d27500f 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -731,7 +731,7 @@ int dccp_invalid_packet(struct sk_buff *skb)
return 1;
}
/*
- * If P.Data Offset is too too large for packet, drop packet and return
+ * If P.Data Offset is too large for packet, drop packet and return
*/
if (!pskb_may_pull(skb, dh->dccph_doff * sizeof(u32))) {
DCCP_WARN("P.Data Offset(%u) too large\n", dh->dccph_doff);
--
1.6.0.6
Replaced "with with" with "with" in multiple files ;-)
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
Documentation/fb/viafb.txt | 2 +-
Documentation/sysfs-rules.txt | 2 +-
drivers/media/dvb/ttpci/av7110.c | 2 +-
drivers/media/video/hdpvr/hdpvr-video.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +-
drivers/staging/android/binder.c | 2 +-
include/linux/usb/gadget.h | 2 +-
kernel/perf_counter.c | 2 +-
net/atm/lec.c | 2 +-
scripts/namespace.pl | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/fb/viafb.txt b/Documentation/fb/viafb.txt
index 67dbf44..de3bc87 100644
--- a/Documentation/fb/viafb.txt
+++ b/Documentation/fb/viafb.txt
@@ -32,7 +32,7 @@
Start viafb with default settings:
#modprobe viafb
- Start viafb with with user options:
+ Start viafb with user options:
#modprobe viafb viafb_mode=800x600 viafb_bpp=16 viafb_refresh=60
viafb_active_dev=CRT+DVI viafb_dvi_port=DVP1
viafb_mode1=1024x768 viafb_bpp=16 viafb_refresh1=60
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt
index 5d8bc2c..aefd8fa 100644
--- a/Documentation/sysfs-rules.txt
+++ b/Documentation/sysfs-rules.txt
@@ -47,7 +47,7 @@ versions of the sysfs interface.
at device creation and removal
- the unique key to the device at that point in time
- the kernel's path to the device directory without the leading
- /sys, and always starting with with a slash
+ /sys, and always starting with a slash
- all elements of a devpath must be real directories. Symlinks
pointing to /sys/devices must always be resolved to their real
target and the target path must be used to access the device.
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index d1d959e..926aee0 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2372,7 +2372,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
budgetpatch = 0;
/* autodetect the presence of budget patch
* this only works if saa7146 has been recently
- * reset with with MASK_31 to MC1
+ * reset with MASK_31 to MC1
*
* will wait for VBI_B event (vertical blank at port B)
* and will reset GPIO3 after VBI_B is detected.
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index ccd47f5..f30dc20 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -361,7 +361,7 @@ static int hdpvr_open(struct file *file)
dev = (struct hdpvr_device *)video_get_drvdata(video_devdata(file));
if (!dev) {
- v4l2_err(&dev->v4l2_dev, "open failing with with ENODEV\n");
+ v4l2_err(&dev->v4l2_dev, "open failing with ENODEV\n");
retval = -ENODEV;
goto err;
}
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 905577f..c3c2bb3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -3609,7 +3609,7 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
}
/*
- * Gerard's alchemy:) that deals with with the data
+ * Gerard's alchemy:) that deals with the data
* pointer for both MDP and the residual calculation.
*
* I didn't want to bloat the code by more than 200
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 17d89a8..67bf227 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -820,7 +820,7 @@ static void binder_delete_free_buffer(struct binder_proc *proc,
if (free_page_start || free_page_end) {
if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC)
printk(KERN_INFO "binder: %d: merge free, buffer %p do "
- "not share page%s%s with with %p or %p\n",
+ "not share page%s%s with %p or %p\n",
proc->pid, buffer, free_page_start ? "" : " end",
free_page_end ? "" : " start", prev, next);
binder_update_page_range(proc, 0, free_page_start ?
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index bbf45d5..de63729 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -195,7 +195,7 @@ static inline int usb_ep_disable(struct usb_ep *ep)
/**
* usb_ep_alloc_request - allocate a request object to use with this endpoint
- * @ep:the endpoint to be used with with the request
+ * @ep:the endpoint to be used with the request
* @gfp_flags:GFP_* flags to use
*
* Request objects must be allocated with this call, since they normally
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index a641eb7..4528a47 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -148,7 +148,7 @@ static void put_ctx(struct perf_counter_context *ctx)
/*
* Get the perf_counter_context for a task and lock it.
- * This has to cope with with the fact that until it is locked,
+ * This has to cope with the fact that until it is locked,
* the context could get moved to another task.
*/
static struct perf_counter_context *
diff --git a/net/atm/lec.c b/net/atm/lec.c
index ff2e594..5132947 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1241,7 +1241,7 @@ module_exit(lane_module_cleanup);
/*
* LANE2: 3.1.3, LE_RESOLVE.request
* Non force allocates memory and fills in *tlvs, fills in *sizeoftlvs.
- * If sizeoftlvs == NULL the default TLVs associated with with this
+ * If sizeoftlvs == NULL the default TLVs associated with this
* lec will be used.
* If dst_mac == NULL, targetless LE_ARP will be sent
*/
diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index c6e88c6..8aaf2b8 100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -58,7 +58,7 @@
# for no good reason, which is frustrating for embedded systems.
# * Wrap config sensitive symbols in #ifdef CONFIG_foo, as long as the
# code does not get too ugly.
-# * Repeat the name space analysis until you can live with with the
+# * Repeat the name space analysis until you can live with the
# result.
#
--
1.6.0.6
Replaced "was was" with "was" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/microblaze/kernel/signal.c | 2 +-
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +-
drivers/parisc/ccio-dma.c | 2 +-
drivers/usb/atm/ueagle-atm.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index 493819c..e7ed1b5 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -11,7 +11,7 @@
*
* 1997-11-28 Modified for POSIX.1b signals by Richard Henderson
*
- * This file was was derived from the sh version, arch/sh/kernel/signal.c
+ * This file was derived from the sh version, arch/sh/kernel/signal.c
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index f40ab69..360c2e7 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -353,7 +353,7 @@ hwicap_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
drvdata->read_buffer + bytes_to_read,
4 - bytes_to_read);
} else {
- /* Get new data from the ICAP, and return was was requested. */
+ /* Get new data from the ICAP, and return was requested. */
kbuf = (u32 *) get_zeroed_page(GFP_KERNEL);
if (!kbuf) {
status = -ENOMEM;
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 0f0e0b9..bd3fdab 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -268,7 +268,7 @@ static int ioc_count;
* Each bit can represent a number of pages.
* LSbs represent lower addresses (IOVA's).
*
-* This was was copied from sba_iommu.c. Don't try to unify
+* This was copied from sba_iommu.c. Don't try to unify
* the two resource managers unless a way to have different
* allocation policies is also adjusted. We'd like to avoid
* I/O TLB thrashing by having resource allocation policy
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index d171b56..774096c 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -52,7 +52,7 @@
* HISTORY : some part of the code was base on ueagle 1.3 BSD driver,
* Damien Bergamini agree to put his code under a DUAL GPL/BSD license.
*
- * The rest of the code was was rewritten from scratch.
+ * The rest of the code was rewritten from scratch.
*/
#include <linux/module.h>
--
1.6.0.6
Replaced "that that" with "that" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
Documentation/RCU/rcu.txt | 2 +-
Documentation/block/as-iosched.txt | 2 +-
Documentation/kernel-parameters.txt | 2 +-
Documentation/memory-barriers.txt | 2 +-
Documentation/networking/ipvs-sysctl.txt | 2 +-
Documentation/trace/ftrace.txt | 2 +-
arch/ia64/hp/sim/simeth.c | 2 +-
arch/m68k/kernel/head.S | 4 ++--
arch/powerpc/kernel/ftrace.c | 4 ++--
arch/s390/lib/delay.c | 2 +-
block/cfq-iosched.c | 2 +-
crypto/twofish_common.c | 2 +-
drivers/char/rio/riointr.c | 2 +-
drivers/input/serio/hp_sdc.c | 2 +-
drivers/net/bonding/bond_alb.c | 2 +-
drivers/s390/char/tape_34xx.c | 2 +-
drivers/usb/wusbcore/wa-xfer.c | 2 +-
fs/configfs/dir.c | 2 +-
fs/direct-io.c | 2 +-
fs/jbd/checkpoint.c | 2 +-
fs/jbd2/checkpoint.c | 2 +-
fs/ntfs/layout.h | 2 +-
fs/xfs/xfs_trans.c | 2 +-
include/linux/ieee80211.h | 2 +-
24 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Documentation/RCU/rcu.txt b/Documentation/RCU/rcu.txt
index 7aa2002..1f3f992 100644
--- a/Documentation/RCU/rcu.txt
+++ b/Documentation/RCU/rcu.txt
@@ -30,7 +30,7 @@ o How can the updater tell when a grace period has completed
Just as with spinlocks, RCU readers are not permitted to
block, switch to user-mode execution, or enter the idle loop.
Therefore, as soon as a CPU is seen passing through any of these
- three states, we know that that CPU has exited any previous RCU
+ three states, we know that CPU has exited any previous RCU
read-side critical sections. So, if we remove an item from a
linked list, and then wait until all CPUs have switched context,
executed in user mode, or executed in the idle loop, we can
diff --git a/Documentation/block/as-iosched.txt b/Documentation/block/as-iosched.txt
index 738b72b..e2bd7b2 100644
--- a/Documentation/block/as-iosched.txt
+++ b/Documentation/block/as-iosched.txt
@@ -108,7 +108,7 @@ or if the next request in the queue is "very close" to the
just completed request, it is dispatched immediately. Otherwise,
statistics (average think time, average seek distance) on the process
that submitted the just completed request are examined. If it seems
-likely that that process will submit another request soon, and that
+likely that process will submit another request soon, and that
request is likely to be near the just completed request, then the IO
scheduler will stop dispatching more read requests for up to (antic_expire)
milliseconds, hoping that process will submit a new request near the one
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d77fbd8..ff712f6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -128,7 +128,7 @@ There are also arch-specific kernel-parameters not documented here.
See for example <Documentation/x86/x86_64/boot-options.txt>.
Note that ALL kernel parameters listed below are CASE SENSITIVE, and that
-a trailing = on the name of any parameter states that that parameter will
+a trailing = on the name of any parameter states that parameter will
be entered as an environment variable, whereas its absence indicates that
it will appear as a kernel argument readable via /proc/cmdline by programs
running once the system is up.
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt
index 7f5809e..194d5bd 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -1936,7 +1936,7 @@ CACHE COHERENCY
---------------
Life isn't quite as simple as it may appear above, however: for while the
-caches are expected to be coherent, there's no guarantee that that coherency
+caches are expected to be coherent, there's no guarantee that coherency
will be ordered. This means that whilst changes made on one CPU will
eventually become visible on all CPUs, there's no guarantee that they will
become apparent in the same order on those other CPUs.
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt
index 4ccdbca..d85c922 100644
--- a/Documentation/networking/ipvs-sysctl.txt
+++ b/Documentation/networking/ipvs-sysctl.txt
@@ -62,7 +62,7 @@ drop_entry - INTEGER
modes (when there is no enough available memory, the strategy
is enabled and the variable is automatically set to 2,
otherwise the strategy is disabled and the variable is set to
- 1), and 3 means that that the strategy is always enabled.
+ 1), and 3 means that the strategy is always enabled.
drop_packet - INTEGER
0 - disabled (default)
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt
index a39b3c7..257d1b4 100644
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
@@ -627,7 +627,7 @@ irqsoff latency trace v1.1.5 on 2.6.26
bash-3730 1d..2 14us : trace_hardirqs_on (sys_setpgid)
-Here we see that that we had a latency of 12 microsecs (which is
+Here we see that we had a latency of 12 microsecs (which is
very good). The _write_lock_irq in sys_setpgid disabled
interrupts. The difference between the 12 and the displayed
timestamp 14us occurred because the clock was incremented
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index e4d8fde..c10c696 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -279,7 +279,7 @@ static __inline__ int dev_is_ethdev(struct net_device *dev)
*
*
* That's also the place where we pass the IP address of this device to the
- * simulator so that that we can start filtering packets for it
+ * simulator so that we can start filtering packets for it
*
* There may be a better way of doing this, but I don't know which yet.
*/
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index dbf95f6..6a90aeb 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -55,7 +55,7 @@
* 3) Increase readability of the code
*
* Of course, readability is a subjective issue, so it will never be
- * argued that that goal was accomplished. It was merely a goal.
+ * argued that goal was accomplished. It was merely a goal.
* A key way to help make code more readable is to give good
* documentation. So, the first thing you will find is exaustive
* write-ups on the structure of the file, and the features of the
@@ -211,7 +211,7 @@
* When head.S boots on Atari, Amiga, Macintosh, and VME
* machines. At that point the underlying logic will be
* believed to be solid enough to be trusted, and TEST_MMU
- * can be dropped. Do note that that will clean up the
+ * can be dropped. Do note that will clean up the
* head.S code significantly as large blocks of #if/#else
* clauses can be removed.
*
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index ce1f3e4..4f0344d 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -115,7 +115,7 @@ __ftrace_make_nop(struct module *mod,
if (probe_kernel_read(&op, (void *)ip, sizeof(int)))
return -EFAULT;
- /* Make sure that that this is still a 24bit jump */
+ /* Make sure that this is still a 24bit jump */
if (!is_bl_op(op)) {
printk(KERN_ERR "Not expected bl: opcode is %x\n", op);
return -EINVAL;
@@ -233,7 +233,7 @@ __ftrace_make_nop(struct module *mod,
if (probe_kernel_read(&op, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
- /* Make sure that that this is still a 24bit jump */
+ /* Make sure that this is still a 24bit jump */
if (!is_bl_op(op)) {
printk(KERN_ERR "Not expected bl: opcode is %x\n", op);
return -EINVAL;
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 3f5f680..9f12379 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -18,7 +18,7 @@ void __delay(unsigned long loops)
/*
* To end the bloody studid and useless discussion about the
* BogoMips number I took the liberty to define the __delay
- * function in a way that that resulting BogoMips number will
+ * function in a way that resulting BogoMips number will
* yield the megahertz number of the cpu. The important function
* is udelay and that is done using the tod clock. -- martin.
*/
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 87276eb..70ee537 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1019,7 +1019,7 @@ static struct cfq_queue *cfqq_close(struct cfq_data *cfqd,
* cur_cfqq - passed in so that we don't decide that the current queue is
* closely cooperating with itself.
*
- * So, basically we're assuming that that cur_cfqq has dispatched at least
+ * So, basically we're assuming that cur_cfqq has dispatched at least
* one request, and that cfqd->last_position reflects a position on the disk
* associated with the I/O issued by cur_cfqq. I'm not sure this is a valid
* assumption.
diff --git a/crypto/twofish_common.c b/crypto/twofish_common.c
index 0af216c..ce1f2a5 100644
--- a/crypto/twofish_common.c
+++ b/crypto/twofish_common.c
@@ -312,7 +312,7 @@ static const u32 mds[4][256] = {
* multiplication is inefficient without hardware support. To multiply
* faster, I make use of the fact x is a generator for the nonzero elements,
* so that every element p of GF(2)[x]/w(x) is either 0 or equal to (x)^n for
- * some n in 0..254. Note that that caret is exponentiation in GF(2^8),
+ * some n in 0..254. Note that caret is exponentiation in GF(2^8),
* *not* polynomial notation. So if I want to compute pq where p and q are
* in GF(2^8), I can just say:
* 1. if p=0 or q=0 then pq=0
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c
index 71f8760..fe1944b 100644
--- a/drivers/char/rio/riointr.c
+++ b/drivers/char/rio/riointr.c
@@ -257,7 +257,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP)
/*
** If there is no data left to be read from the port, and
** it's handshake bit is set, then we must clear the handshake,
- ** so that that downstream RTA is re-enabled.
+ ** so that downstream RTA is re-enabled.
*/
if (!can_remove_receive(&PacketP, PortP) && (readw(&PortP->PhbP->handshake) == PHB_HANDSHAKE_SET)) {
/*
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 1c9410d..1e7741b 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -586,7 +586,7 @@ unsigned long hp_sdc_put(void)
finish:
/* If by some quirk IBF has cleared and our ISR has run to
- see that that has happened, do it all again. */
+ see that has happened, do it all again. */
if (!hp_sdc.ibf && limit++ < 20)
goto anew;
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 46d312b..7633319 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1037,7 +1037,7 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,
* If @slave's permanent hw address is different both from its current
* address and from @bond's address, then somewhere in the bond there's
* a slave that has @slave's permanet address as its current address.
- * We'll make sure that that slave no longer uses @slave's permanent address.
+ * We'll make sure that slave no longer uses @slave's permanent address.
*
* Caller must hold RTNL and no other locks
*/
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 5a519fa..162890e 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -537,7 +537,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
case 0x2e:
/*
* Not capable. This indicates either that the drive fails
- * reading the format id mark or that that format specified
+ * reading the format id mark or that format specified
* is not supported by the drive.
*/
dev_warn (&device->cdev->dev, "The tape unit cannot process "
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 613a5fc..5a1a9a0 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -1079,7 +1079,7 @@ EXPORT_SYMBOL_GPL(wa_urb_enqueue);
* needs to be dequeued with completion calling; when stuck in delayed
* or before wa_xfer_setup() is called, we need to do completion.
*
- * not setup If there is no hcpriv yet, that means that that enqueue
+ * not setup If there is no hcpriv yet, that means that enqueue
* still had no time to set the xfer up. Because
* urb->status should be other than -EINPROGRESS,
* enqueue() will catch that and bail out.
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 8e48b52..f080110 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1140,7 +1140,7 @@ EXPORT_SYMBOL(configfs_depend_item);
/*
* Release the dependent linkage. This is much simpler than
- * configfs_depend_item() because we know that that the client driver is
+ * configfs_depend_item() because we know that the client driver is
* pinned, thus the subsystem is pinned, and therefore configfs is pinned.
*/
void configfs_undepend_item(struct configfs_subsystem *subsys,
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 8b10b87..eb5be29 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -359,7 +359,7 @@ static void dio_cleanup(struct dio *dio)
* Wait for the next BIO to complete. Remove it and return it. NULL is
* returned once all BIOs have been completed. This must only be called once
* all bios have been issued so that dio->refcount can only decrease. This
- * requires that that the caller hold a reference on the dio.
+ * requires that the caller hold a reference on the dio.
*/
static struct bio *dio_await_one(struct dio *dio)
{
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 61f32f3..18840e6 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -13,7 +13,7 @@
* Part of the ext2fs journaling system.
*
* Checkpointing is the process of ensuring that a section of the log is
- * committed fully to disk, so that that portion of the log can be
+ * committed fully to disk, so that portion of the log can be
* reused.
*/
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 5d70b3e..61de639 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -13,7 +13,7 @@
* Part of the ext2fs journaling system.
*
* Checkpointing is the process of ensuring that a section of the log is
- * committed fully to disk, so that that portion of the log can be
+ * committed fully to disk, so that portion of the log can be
* reused.
*/
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h
index 50931b1..bd44d2b 100644
--- a/fs/ntfs/layout.h
+++ b/fs/ntfs/layout.h
@@ -1153,7 +1153,7 @@ typedef struct {
/* The following fields are optional. The attribute value size is 16
bytes, i.e. sizeof(GUID), if these are not present at all. Note,
the entries can be present but one or more (or all) can be zero
- meaning that that particular value(s) is(are) not defined. */
+ meaning that particular value(s) is(are) not defined. */
union {
struct {
GUID birth_volume_id; /* Unique id of volume on which
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 66b8493..887d894 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -634,7 +634,7 @@ xfs_trans_apply_sb_deltas(
* xfs_trans_unreserve_and_mod_sb() is called to release unused reservations
* and apply superblock counter changes to the in-core superblock. The
* t_res_fdblocks_delta and t_res_frextents_delta fields are explicitly NOT
- * applied to the in-core superblock. The idea is that that has already been
+ * applied to the in-core superblock. The idea is that has already been
* done.
*
* This is done efficiently with a single call to xfs_mod_incore_sb_batch().
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index a9173d5..ce6722d 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -264,7 +264,7 @@ static inline int ieee80211_is_data_qos(__le16 fc)
static inline int ieee80211_is_data_present(__le16 fc)
{
/*
- * mask with 0x40 and test that that bit is clear to only return true
+ * mask with 0x40 and test that bit is clear to only return true
* for the data-containing substypes.
*/
return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | 0x40)) ==
--
1.6.0.6
Replaced "should should" with "should" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/ia64/include/asm/sn/pda.h | 2 +-
drivers/char/amiserial.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/include/asm/sn/pda.h b/arch/ia64/include/asm/sn/pda.h
index 1c5108d..8ef9fb7 100644
--- a/arch/ia64/include/asm/sn/pda.h
+++ b/arch/ia64/include/asm/sn/pda.h
@@ -56,7 +56,7 @@ typedef struct pda_s {
* in the same page as the cpu_data area. Note that there is a check in the setup
* code to verify that we don't overflow the page.
*
- * Seems like we should should cache-line align the pda so that any changes in the
+ * Seems like we should cache-line align the pda so that any changes in the
* size of the cpu_data area don't change cache layout. Should we align to 32, 64, 128
* or 512 boundary. Each has merits. For now, pick 128 but should be revisited later.
*/
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 72429b6..7132577 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -13,7 +13,7 @@
* (non hardware specific) changes to serial.c.
*
* The port is registered with the tty driver as minor device 64, and
- * therefore other ports should should only use 65 upwards.
+ * therefore other ports should only use 65 upwards.
*
* Richard Lucock 28/12/99
*
--
1.6.0.6
Replaced "we we" with "we" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
drivers/rtc/rtc-m41t80.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +-
drivers/watchdog/eurotechwdt.c | 2 +-
drivers/watchdog/pc87413_wdt.c | 2 +-
drivers/watchdog/w83977f_wdt.c | 2 +-
drivers/watchdog/wdt.c | 2 +-
drivers/watchdog/wdt977.c | 2 +-
drivers/watchdog/wdt_pci.c | 2 +-
fs/cifs/inode.c | 2 +-
fs/ocfs2/cluster/quorum.c | 2 +-
fs/xfs/xfs_trans_ail.c | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 60fe266..1cc8599 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -590,7 +590,7 @@ static void wdt_disable(void)
* @ppos: pointer to the position to write. No seeks allowed
*
* A write to a watchdog device is defined as a keepalive signal. Any
- * write of data will do, as we we don't define content meaning.
+ * write of data will do, as we don't define content meaning.
*/
static ssize_t wdt_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h
index 053e63c..c06ddf3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.h
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h
@@ -370,7 +370,7 @@ struct sym_tcbh {
/*
* Scripts bus addresses of LUN table accessed from scripts.
* LUN #0 is a special case, since multi-lun devices are rare,
- * and we we want to speed-up the general case and not waste
+ * and we want to speed-up the general case and not waste
* resources.
*/
u32 luntbl_sa; /* bus address of this table */
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index 9add354..bc6c205 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -196,7 +196,7 @@ static void eurwdt_ping(void)
* @ppos: pointer to the position to write. No seeks allowed
*
* A write to a watchdog device is defined as a keepalive signal. Any
- * write of data will do, as we we don't define content meaning.
+ * write of data will do, as we don't define content meaning.
*/
static ssize_t eurwdt_write(struct file *file, const char __user *buf,
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index 1a2b916..d0e0bbf 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -355,7 +355,7 @@ static int pc87413_status(void)
* @ppos: pointer to the position to write. No seeks allowed
*
* A write to a watchdog device is defined as a keepalive signal. Any
- * write of data will do, as we we don't define content meaning.
+ * write of data will do, as we don't define content meaning.
*/
static ssize_t pc87413_write(struct file *file, const char __user *data,
diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 0560182..aa30c14 100644
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -328,7 +328,7 @@ static int wdt_release(struct inode *inode, struct file *file)
* @ppos: pointer to the position to write. No seeks allowed
*
* A write to a watchdog device is defined as a keepalive signal. Any
- * write of data will do, as we we don't define content meaning.
+ * write of data will do, as we don't define content meaning.
*/
static ssize_t wdt_write(struct file *file, const char __user *buf,
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index 3bbefe9..913fd3d 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -314,7 +314,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
* @ppos: pointer to the position to write. No seeks allowed
*
* A write to a watchdog device is defined as a keepalive signal. Any
- * write of data will do, as we we don't define content meaning.
+ * write of data will do, as we don't define content meaning.
*/
static ssize_t wdt_write(struct file *file, const char __user *buf,
diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c
index 90ef70e..088ffaa 100644
--- a/drivers/watchdog/wdt977.c
+++ b/drivers/watchdog/wdt977.c
@@ -304,7 +304,7 @@ static int wdt977_release(struct inode *inode, struct file *file)
* @ppos: pointer to the position to write. No seeks allowed
*
* A write to a watchdog device is defined as a keepalive signal. Any
- * write of data will do, as we we don't define content meaning.
+ * write of data will do, as we don't define content meaning.
*/
static ssize_t wdt977_write(struct file *file, const char __user *buf,
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 7a1bdc7..ad0f3af 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -367,7 +367,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id)
* @ppos: pointer to the position to write. No seeks allowed
*
* A write to a watchdog device is defined as a keepalive signal. Any
- * write of data will do, as we we don't define content meaning.
+ * write of data will do, as we don't define content meaning.
*/
static ssize_t wdtpci_write(struct file *file, const char __user *buf,
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 155c9e7..3b45583 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1085,7 +1085,7 @@ void posix_fill_in_inode(struct inode *tmp_inode,
/*
* No sense invalidating pages for new inode
- * since we we have not started caching
+ * since we have not started caching
* readahead file data yet.
*/
if (isNewInode)
diff --git a/fs/ocfs2/cluster/quorum.c b/fs/ocfs2/cluster/quorum.c
index bbacf7d..9a0b397 100644
--- a/fs/ocfs2/cluster/quorum.c
+++ b/fs/ocfs2/cluster/quorum.c
@@ -253,7 +253,7 @@ void o2quo_hb_still_up(u8 node)
/* This is analagous to hb_up. as a node's connection comes up we delay the
* quorum decision until we see it heartbeating. the hold will be droped in
* hb_up or hb_down. it might be perpetuated by con_err until hb_down. if
- * it's already heartbeating we we might be dropping a hold that conn_up got.
+ * it's already heartbeating we might be dropping a hold that conn_up got.
* */
void o2quo_conn_up(u8 node)
{
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
index f31271c..a42158f 100644
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
@@ -343,7 +343,7 @@ xfsaild_push(
/*
* Are there too many items we can't do anything with?
- * If we we are skipping too many items because we can't flush
+ * If we are skipping too many items because we can't flush
* them or they are already being flushed, we back off and
* given them time to complete whatever operation is being
* done. i.e. remove pressure from the AIL while we can't make
--
1.6.0.6
Replaced "this this" with "this" in multiple files
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/powerpc/kernel/process.c | 4 ++--
drivers/net/tulip/xircom_cb.c | 4 ++--
drivers/net/wireless/orinoco/main.h | 2 +-
fs/ext3/inode.c | 2 +-
fs/ext4/inode.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 892a9f2..fa71472 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -352,7 +352,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
#else /* CONFIG_SMP */
#ifdef CONFIG_ALTIVEC
- /* Avoid the trap. On smp this this never happens since
+ /* Avoid the trap. On smp this never happens since
* we don't set last_task_used_altivec -- Cort
*/
if (new->thread.regs && last_task_used_altivec == new)
@@ -363,7 +363,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
new->thread.regs->msr |= MSR_VSX;
#endif /* CONFIG_VSX */
#ifdef CONFIG_SPE
- /* Avoid the trap. On smp this this never happens since
+ /* Avoid the trap. On smp this never happens since
* we don't set last_task_used_spe
*/
if (new->thread.regs && last_task_used_spe == new)
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index c2ca9f4..47060c5 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -793,7 +793,7 @@ static void activate_receiver(struct xircom_private *card)
/*
deactivate_receiver disables the receiver on the card.
-To achieve this this code disables the receiver first;
+To achieve this code disables the receiver first;
then it waits for the receiver to become inactive.
must be called with the lock held and interrupts disabled.
@@ -884,7 +884,7 @@ static void activate_transmitter(struct xircom_private *card)
/*
deactivate_transmitter disables the transmitter on the card.
-To achieve this this code disables the transmitter first;
+To achieve this code disables the transmitter first;
then it waits for the transmitter to become inactive.
must be called with the lock held and interrupts disabled.
diff --git a/drivers/net/wireless/orinoco/main.h b/drivers/net/wireless/orinoco/main.h
index af2bae4..7154d07 100644
--- a/drivers/net/wireless/orinoco/main.h
+++ b/drivers/net/wireless/orinoco/main.h
@@ -12,7 +12,7 @@
/* Compile time configuration and compatibility stuff */
/********************************************************************/
-/* We do this this way to avoid ifdefs in the actual code */
+/* We do this way to avoid ifdefs in the actual code */
#ifdef WIRELESS_SPY
#define SPY_NUMBER(priv) (priv->spy_data.spy_number)
#else
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 5f51fed..56093fd 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2269,7 +2269,7 @@ static void ext3_free_branches(handle_t *handle, struct inode *inode,
ext3_forget(handle, 1, inode, bh, bh->b_blocknr);
/*
- * Everything below this this pointer has been
+ * Everything below this pointer has been
* released. Now let this top-of-subtree go.
*
* We want the freeing of this indirect block to be
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 60a26f3..d431c3a 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3979,7 +3979,7 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode,
ext4_forget(handle, 1, inode, bh, bh->b_blocknr);
/*
- * Everything below this this pointer has been
+ * Everything below this pointer has been
* released. Now let this top-of-subtree go.
*
* We want the freeing of this indirect block to be
--
1.6.0.6
Replaced "you you" with "you"
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
Documentation/DocBook/uio-howto.tmpl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index 8f6e3b2..a55491c 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -511,7 +511,7 @@ Here's a description of the fields of <varname>struct uio_mem</varname>:
<itemizedlist>
<listitem><para>
<varname>int memtype</varname>: Required if the mapping is used. Set this to
-<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
+<varname>UIO_MEM_PHYS</varname> if you have physical memory on your
card to be mapped. Use <varname>UIO_MEM_LOGICAL</varname> for logical
memory (e.g. allocated with <function>kmalloc()</function>). There's also
<varname>UIO_MEM_VIRTUAL</varname> for virtual memory.
--
1.6.0.6
Replaced "test test" with "test"
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
drivers/net/skfp/fplustm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 6028bbb..f6ebed0 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -1321,7 +1321,7 @@ void mac_set_rx_mode(struct s_smc *smc, int mode)
o Connect a UPPS ISA or EISA station to the network.
o Give the FORMAC of UPPS station the command to send
restricted tokens until the ring becomes instable.
- o Now connect your test test client.
+ o Now connect your test client.
o The restricted token monitor should detect the restricted token,
and your break point will be reached.
o You can ovserve how the station will clean the ring.
--
1.6.0.6
Jaswinder Singh Rajput <[email protected]> wrote:
> - * acknowledges receipt, i.e. has has a chance to establish any
> + * acknowledges receipt, i.e. has a chance to establish any
Should that be just "has", or should it be "has had"?
David
Jaswinder Singh Rajput <[email protected]> wrote:
> - * The type of reading going on on this chip
> + * The type of reading going on this chip
Nak. I think "going on" is a compound verb here, so "going on on this chip"
is very probably correct.
David
Jaswinder Singh Rajput <[email protected]> wrote:
> - three states, we know that that CPU has exited any previous RCU
> + three states, we know that CPU has exited any previous RCU
That's probably wrong. Look at it as "we know that _that_ CPU".
> -likely that that process will submit another request soon, and that
> +likely that process will submit another request soon, and that
Ditto. Most people would actually say two 'that' words here, and the emphasis
goes on the second one.
> -caches are expected to be coherent, there's no guarantee that that coherency
> +caches are expected to be coherent, there's no guarantee that coherency
NAK. This is correct before. This doesn't make any sense with the second
'that' removed.
> - 1), and 3 means that that the strategy is always enabled.
> + 1), and 3 means that the strategy is always enabled.
This is probably correct. The second 'that' or the 'the' is wrong because both
the second 'that' and the 'the' are trying to specify the strategy.
> -Here we see that that we had a latency of 12 microsecs (which is
> +Here we see that we had a latency of 12 microsecs (which is
Correct.
> ...
Various of the remainder are incorrect.
David
Jaswinder Singh Rajput <[email protected]> wrote:
> Jaswinder Singh Rajput (22):
> trivial: fix typo "has has" in multiple files
> trivial: fix typo "on on" in multiple files
> trivial: fix typo "that that" in multiple files
NAK. You can't just mechanically reduce the above pairs of words to a single
instance unconditionally.
"has has" should perhaps be "has had" in some cases.
In "on on", the first preposition may be part of a compound verb (eg: "to go
on").
In "that that", the second "that" may be specifying the object in relation to
a previous part of the text.
David
On Tue, 07 Jul 2009 16:44:00 +0100
David Howells <[email protected]> wrote:
> Jaswinder Singh Rajput <[email protected]> wrote:
>
> > Jaswinder Singh Rajput (22):
> > trivial: fix typo "has has" in multiple files
> > trivial: fix typo "on on" in multiple files
> > trivial: fix typo "that that" in multiple files
>
> NAK. You can't just mechanically reduce the above pairs of words to
> a single instance unconditionally.
>
> "has has" should perhaps be "has had" in some cases.
>
> In "on on", the first preposition may be part of a compound verb (eg:
> "to go on").
>
> In "that that", the second "that" may be specifying the object in
> relation to a previous part of the text.
What's more, these types of patchsets don't actually improve things in
any real way. If these changes were submitted as part of some greater
work, involving clarifying the text or making the text match the code,
or cleaning up the code in some real way (refactoring common stuff etc)
I'd be fine with it.
But as it stands it just makes lkml that much more difficult to read,
and clogs the changelog with fairly useless bits. But maybe I'm
missing the "greater work" part of this set; I haven't looked at all 22
patches here.
--
Jesse Barnes, Intel Open Source Technology Center
On Tue, Jul 07, 2009 at 07:52:31PM +0530, Jaswinder Singh Rajput wrote:
>
> Replaced "that that" with "that" in multiple files
>
> Signed-off-by: Jaswinder Singh Rajput <[email protected]>
> ---
> Documentation/RCU/rcu.txt | 2 +-
> Documentation/block/as-iosched.txt | 2 +-
> Documentation/kernel-parameters.txt | 2 +-
> Documentation/memory-barriers.txt | 2 +-
> Documentation/networking/ipvs-sysctl.txt | 2 +-
> Documentation/trace/ftrace.txt | 2 +-
> arch/ia64/hp/sim/simeth.c | 2 +-
> arch/m68k/kernel/head.S | 4 ++--
> arch/powerpc/kernel/ftrace.c | 4 ++--
> arch/s390/lib/delay.c | 2 +-
> block/cfq-iosched.c | 2 +-
> crypto/twofish_common.c | 2 +-
> drivers/char/rio/riointr.c | 2 +-
> drivers/input/serio/hp_sdc.c | 2 +-
> drivers/net/bonding/bond_alb.c | 2 +-
> drivers/s390/char/tape_34xx.c | 2 +-
> drivers/usb/wusbcore/wa-xfer.c | 2 +-
> fs/configfs/dir.c | 2 +-
> fs/direct-io.c | 2 +-
> fs/jbd/checkpoint.c | 2 +-
> fs/jbd2/checkpoint.c | 2 +-
> fs/ntfs/layout.h | 2 +-
> fs/xfs/xfs_trans.c | 2 +-
> include/linux/ieee80211.h | 2 +-
> 24 files changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/Documentation/RCU/rcu.txt b/Documentation/RCU/rcu.txt
> index 7aa2002..1f3f992 100644
> --- a/Documentation/RCU/rcu.txt
> +++ b/Documentation/RCU/rcu.txt
> @@ -30,7 +30,7 @@ o How can the updater tell when a grace period has completed
> Just as with spinlocks, RCU readers are not permitted to
> block, switch to user-mode execution, or enter the idle loop.
> Therefore, as soon as a CPU is seen passing through any of these
> - three states, we know that that CPU has exited any previous RCU
> + three states, we know that CPU has exited any previous RCU
> read-side critical sections. So, if we remove an item from a
> linked list, and then wait until all CPUs have switched context,
> executed in user mode, or executed in the idle loop, we can
As David Howells noted, this is not correct. To fix the admittedly
awkward phrasing, how about the following?
Just as with spinlocks, RCU readers are not permitted to block,
switch to user-mode execution, or enter the idle loop. Therefore,
as soon as a given CPU is seen passing through any of these
three states, we know that this CPU has exited any previous RCU
read-side critical sections. So, if we remove an item from a
linked list, and then wait until all CPUs have switched context,
executed in user mode, or executed in the idle loop, we can
Thanx, Paul
To stay on the safe side skipping following patches from V1 which can
raise confusions and objections:
trivial: fix typo "and and" in multiple files
trivial: fix typo "are are" in multiple files
trivial: fix typo "has has" in multiple files
trivial: fix typo "on on" in multiple files
trivial: fix typo "that that" in multiple files
trivial: fix typo "this this" in multiple files
The following changes since commit faf80d62e44dc627efb741f48db50c1858d1667c:
Linus Torvalds (1):
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6.git master
Jaswinder Singh Rajput (16):
trivial: fix typo "a a" in multiple files
trivial: fix typo "as as" in multiple files
trivial: fix typo "be be" in multiple files
trivial: fix typo "bit bit" in multiple files
trivial: fix typo "by by" in multiple files
trivial: fix typo "can can"
trivial: fix typo "could could" in multiple files
trivial: fix typo "from from" in multiple files
trivial: fix typo "lock lock"
trivial: fix typo "should should" in multiple files
trivial: fix typo "test test"
trivial: fix typo "too too"
trivial: fix typo "was was" in multiple files
trivial: fix typo "we we" in multiple files
trivial: fix typo "with with" in multiple files
trivial: fix typo "you you"
Documentation/DocBook/uio-howto.tmpl | 2 +-
Documentation/fb/viafb.txt | 2 +-
Documentation/filesystems/caching/operations.txt | 2 +-
Documentation/scsi/advansys.txt | 2 +-
Documentation/sysfs-rules.txt | 2 +-
arch/frv/kernel/sleep.S | 2 +-
arch/ia64/include/asm/sn/pda.h | 2 +-
arch/microblaze/kernel/signal.c | 2 +-
arch/mips/cavium-octeon/setup.c | 2 +-
arch/mips/include/asm/octeon/octeon.h | 2 +-
arch/sparc/kernel/head_64.S | 2 +-
arch/x86/include/asm/xen/hypercall.h | 2 +-
arch/x86/math-emu/reg_u_sub.S | 2 +-
crypto/testmgr.h | 10 +++++-----
drivers/char/amiserial.c | 2 +-
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +-
drivers/media/dvb/ttpci/av7110.c | 2 +-
drivers/media/video/hdpvr/hdpvr-video.c | 2 +-
drivers/media/video/ov511.c | 2 +-
drivers/media/video/ovcamchip/ov7x10.c | 2 +-
drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +-
drivers/mtd/ubi/vmt.c | 4 ++--
drivers/net/fs_enet/fs_enet.h | 2 +-
drivers/net/ixgbe/ixgbe_82598.c | 2 +-
drivers/net/ixgbe/ixgbe_82599.c | 2 +-
drivers/net/ixgbe/ixgbe_common.c | 2 +-
drivers/net/s2io.c | 2 +-
drivers/net/skfp/fplustm.c | 2 +-
drivers/net/sky2.c | 2 +-
drivers/net/wireless/libertas/scan.c | 2 +-
drivers/parisc/ccio-dma.c | 2 +-
drivers/pci/hotplug/ibmphp.h | 2 +-
drivers/rtc/rtc-m41t80.c | 2 +-
drivers/scsi/libfc/fc_fcp.c | 2 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +-
drivers/staging/android/binder.c | 2 +-
drivers/staging/frontier/alphatrack.c | 2 +-
drivers/staging/frontier/tranzport.c | 2 +-
.../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +-
drivers/staging/rtl8192su/r8192S_phy.c | 2 +-
drivers/staging/rtl8192su/r819xU_phy.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
drivers/usb/atm/ueagle-atm.c | 2 +-
drivers/video/aty/mach64_cursor.c | 2 +-
drivers/video/riva/fbdev.c | 2 +-
drivers/watchdog/eurotechwdt.c | 2 +-
drivers/watchdog/pc87413_wdt.c | 2 +-
drivers/watchdog/w83977f_wdt.c | 2 +-
drivers/watchdog/wdt.c | 2 +-
drivers/watchdog/wdt977.c | 2 +-
drivers/watchdog/wdt_pci.c | 2 +-
fs/cifs/inode.c | 2 +-
fs/exec.c | 2 +-
fs/jbd/journal.c | 2 +-
fs/jbd2/journal.c | 2 +-
fs/ocfs2/cluster/quorum.c | 2 +-
fs/squashfs/cache.c | 2 +-
fs/ubifs/misc.h | 2 +-
fs/ufs/super.c | 2 +-
fs/xfs/xfs_trans_ail.c | 2 +-
include/linux/exportfs.h | 2 +-
include/linux/ipv6.h | 2 +-
include/linux/mtd/pfow.h | 2 +-
include/linux/usb/gadget.h | 2 +-
include/linux/wimax/debug.h | 2 +-
include/sound/soc-dai.h | 2 +-
kernel/perf_counter.c | 2 +-
net/atm/lec.c | 2 +-
net/dccp/ipv4.c | 2 +-
net/ipv4/netfilter/nf_nat_pptp.c | 2 +-
net/netfilter/nf_conntrack_pptp.c | 2 +-
net/rds/ib_cm.c | 2 +-
net/rds/iw_cm.c | 2 +-
net/sctp/sm_make_chunk.c | 2 +-
net/sunrpc/svcsock.c | 2 +-
scripts/Kbuild.include | 2 +-
scripts/namespace.pl | 2 +-
sound/isa/cs423x/cs4236_lib.c | 2 +-
sound/isa/es18xx.c | 2 +-
81 files changed, 86 insertions(+), 86 deletions(-)
On Tue, Jul 07, 2009 at 04:37:14PM +0100, David Howells wrote:
> Jaswinder Singh Rajput <[email protected]> wrote:
>
> > - three states, we know that that CPU has exited any previous RCU
> > + three states, we know that CPU has exited any previous RCU
>
> That's probably wrong. Look at it as "we know that _that_ CPU".
>
> > -likely that that process will submit another request soon, and that
> > +likely that process will submit another request soon, and that
>
> Ditto. Most people would actually say two 'that' words here, and the emphasis
> goes on the second one.
Would it be possible to reword as for the RCU example? The "that that"
can read awkwardly even for native English (or, for that matter, American)
speakers, even though it sounds quite natural in spoken English.
"likely that this process will submit another request soon, and that"
Thanx, Paul
> > -caches are expected to be coherent, there's no guarantee that that coherency
> > +caches are expected to be coherent, there's no guarantee that coherency
>
> NAK. This is correct before. This doesn't make any sense with the second
> 'that' removed.
>
> > - 1), and 3 means that that the strategy is always enabled.
> > + 1), and 3 means that the strategy is always enabled.
>
> This is probably correct. The second 'that' or the 'the' is wrong because both
> the second 'that' and the 'the' are trying to specify the strategy.
>
> > -Here we see that that we had a latency of 12 microsecs (which is
> > +Here we see that we had a latency of 12 microsecs (which is
>
> Correct.
>
> > ...
>
> Various of the remainder are incorrect.
>
> David
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
Hello David,
On Tue, 2009-07-07 at 16:44 +0100, David Howells wrote:
> Jaswinder Singh Rajput <[email protected]> wrote:
>
> > Jaswinder Singh Rajput (22):
> > trivial: fix typo "has has" in multiple files
> > trivial: fix typo "on on" in multiple files
> > trivial: fix typo "that that" in multiple files
>
> NAK. You can't just mechanically reduce the above pairs of words to a single
> instance unconditionally.
>
> "has has" should perhaps be "has had" in some cases.
>
> In "on on", the first preposition may be part of a compound verb (eg: "to go
> on").
>
> In "that that", the second "that" may be specifying the object in relation to
> a previous part of the text.
>
Thanks for your feed-back.
I removed all the patches pointed by you and also removed some more
patches which can create confusion.
Please check new pull request, and let me know if you found some more
issues :
[GIT PULL] V2 trivial fixes typo "foo foo"
Thanks,
--
JSR
Hello Paul,
On Tue, 2009-07-07 at 09:30 -0700, Paul E. McKenney wrote:
> On Tue, Jul 07, 2009 at 07:52:31PM +0530, Jaswinder Singh Rajput wrote:
> As David Howells noted, this is not correct. To fix the admittedly
> awkward phrasing, how about the following?
>
> Just as with spinlocks, RCU readers are not permitted to block,
> switch to user-mode execution, or enter the idle loop. Therefore,
> as soon as a given CPU is seen passing through any of these
> three states, we know that this CPU has exited any previous RCU
> read-side critical sections. So, if we remove an item from a
> linked list, and then wait until all CPUs have switched context,
> executed in user mode, or executed in the idle loop, we can
>
I already dropped this and some more patches as per David's suggestion.
Please check new pull request, and let me know if you found some more
issues :
[GIT PULL] V2 trivial fixes typo "foo foo"
Thanks,
--
JSR
Paul E. McKenney <[email protected]> wrote:
> The "that that" can read awkwardly even for native English (or, for that
> matter, American) speakers, even though it sounds quite natural in spoken
> English.
I think it sounds quite natural when you say it because you say them
differently - or at least I do. The first 'that' is a conjunction, and the
second a determinative. Possibly the determinative should be in italics, but
that's hard to do in plain text.
> Would it be possible to reword as for the RCU example?
> ...
> "likely that this process will submit another request soon, and that"
This is actually the as-iosched.txt example.
To use the RCU example:
Therefore, as soon as a CPU is seen passing through any of these
three states, we know that that CPU has exited any previous RCU
read-side critical sections.
I think that in this example, "a CPU" should be paired with the "that"
determinative because you're not talking about the CPU you've got in your hand
per se, but a random CPU over there.
If you instead said "this CPU", being more specific, I think that's when you'd
use the "this" determinative:
Therefore, as soon as this CPU is seen passing through any of these
three states, we know that this CPU has exited any previous RCU
read-side critical sections.
Of course, I'm not a qualified linguist - I know enough to make stuff up and
hopefully make it sound plausible.
David
On Tue, 7 Jul 2009, Jesse Barnes wrote:
> What's more, these types of patchsets don't actually improve things in
> any real way.
Just submitting this to [email protected] should be appropriate and
acceptable. But CCing 20 people + LKML on this trvially trivial stuff is
really overboard.
--
Jiri Kosina
SUSE Labs
Hello Jiri,
On Wed, 2009-07-08 at 00:15 +0200, Jiri Kosina wrote:
> On Tue, 7 Jul 2009, Jesse Barnes wrote:
>
> > What's more, these types of patchsets don't actually improve things in
> > any real way.
>
> Just submitting this to [email protected] should be appropriate and
> acceptable. But CCing 20 people + LKML on this trvially trivial stuff is
> really overboard.
>
I agree, in normal cases sending email to [email protected] is enough.
But this was little bit special because it was changing :
143 files changed, 159 insertions(+), 159 deletions(-)
But I only send header(first) email to those maintainers who are
responsible for those files.
Please check new pull request, and let me know if you found some more
issues or facing any problem in pull:
[GIT PULL] V2 trivial fixes typo "foo foo"
Thanks,
--
JSR
Jiri Kosina <[email protected]> wrote:
> Just submitting this to [email protected] should be appropriate and
> acceptable. But CCing 20 people + LKML on this trvially trivial stuff is
> really overboard.
On the other hand, if it had just gone to [email protected], I suspect I
wouldn't have known about the changes, and wouldn't've been able to reject
some of them.
David
Hello Jiri,
On Tue, 2009-07-07 at 22:00 +0530, Jaswinder Singh Rajput wrote:
> To stay on the safe side skipping following patches from V1 which can
> raise confusions and objections:
>
> trivial: fix typo "and and" in multiple files
> trivial: fix typo "are are" in multiple files
> trivial: fix typo "has has" in multiple files
> trivial: fix typo "on on" in multiple files
> trivial: fix typo "that that" in multiple files
> trivial: fix typo "this this" in multiple files
>
>
> The following changes since commit faf80d62e44dc627efb741f48db50c1858d1667c:
> Linus Torvalds (1):
> Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6.git master
>
> Jaswinder Singh Rajput (16):
> trivial: fix typo "a a" in multiple files
> trivial: fix typo "as as" in multiple files
> trivial: fix typo "be be" in multiple files
> trivial: fix typo "bit bit" in multiple files
> trivial: fix typo "by by" in multiple files
> trivial: fix typo "can can"
> trivial: fix typo "could could" in multiple files
> trivial: fix typo "from from" in multiple files
> trivial: fix typo "lock lock"
> trivial: fix typo "should should" in multiple files
> trivial: fix typo "test test"
> trivial: fix typo "too too"
> trivial: fix typo "was was" in multiple files
> trivial: fix typo "we we" in multiple files
> trivial: fix typo "with with" in multiple files
> trivial: fix typo "you you"
>
Have you pulled these patches.
Please Let me know if you face any issues.
Thanks,
--
JSR
> Documentation/DocBook/uio-howto.tmpl | 2 +-
> Documentation/fb/viafb.txt | 2 +-
> Documentation/filesystems/caching/operations.txt | 2 +-
> Documentation/scsi/advansys.txt | 2 +-
> Documentation/sysfs-rules.txt | 2 +-
> arch/frv/kernel/sleep.S | 2 +-
> arch/ia64/include/asm/sn/pda.h | 2 +-
> arch/microblaze/kernel/signal.c | 2 +-
> arch/mips/cavium-octeon/setup.c | 2 +-
> arch/mips/include/asm/octeon/octeon.h | 2 +-
> arch/sparc/kernel/head_64.S | 2 +-
> arch/x86/include/asm/xen/hypercall.h | 2 +-
> arch/x86/math-emu/reg_u_sub.S | 2 +-
> crypto/testmgr.h | 10 +++++-----
> drivers/char/amiserial.c | 2 +-
> drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +-
> drivers/media/dvb/ttpci/av7110.c | 2 +-
> drivers/media/video/hdpvr/hdpvr-video.c | 2 +-
> drivers/media/video/ov511.c | 2 +-
> drivers/media/video/ovcamchip/ov7x10.c | 2 +-
> drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +-
> drivers/mtd/ubi/vmt.c | 4 ++--
> drivers/net/fs_enet/fs_enet.h | 2 +-
> drivers/net/ixgbe/ixgbe_82598.c | 2 +-
> drivers/net/ixgbe/ixgbe_82599.c | 2 +-
> drivers/net/ixgbe/ixgbe_common.c | 2 +-
> drivers/net/s2io.c | 2 +-
> drivers/net/skfp/fplustm.c | 2 +-
> drivers/net/sky2.c | 2 +-
> drivers/net/wireless/libertas/scan.c | 2 +-
> drivers/parisc/ccio-dma.c | 2 +-
> drivers/pci/hotplug/ibmphp.h | 2 +-
> drivers/rtc/rtc-m41t80.c | 2 +-
> drivers/scsi/libfc/fc_fcp.c | 2 +-
> drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
> drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +-
> drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +-
> drivers/staging/android/binder.c | 2 +-
> drivers/staging/frontier/alphatrack.c | 2 +-
> drivers/staging/frontier/tranzport.c | 2 +-
> .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +-
> drivers/staging/rtl8192su/r8192S_phy.c | 2 +-
> drivers/staging/rtl8192su/r819xU_phy.c | 2 +-
> drivers/staging/wlan-ng/prism2sta.c | 2 +-
> drivers/usb/atm/ueagle-atm.c | 2 +-
> drivers/video/aty/mach64_cursor.c | 2 +-
> drivers/video/riva/fbdev.c | 2 +-
> drivers/watchdog/eurotechwdt.c | 2 +-
> drivers/watchdog/pc87413_wdt.c | 2 +-
> drivers/watchdog/w83977f_wdt.c | 2 +-
> drivers/watchdog/wdt.c | 2 +-
> drivers/watchdog/wdt977.c | 2 +-
> drivers/watchdog/wdt_pci.c | 2 +-
> fs/cifs/inode.c | 2 +-
> fs/exec.c | 2 +-
> fs/jbd/journal.c | 2 +-
> fs/jbd2/journal.c | 2 +-
> fs/ocfs2/cluster/quorum.c | 2 +-
> fs/squashfs/cache.c | 2 +-
> fs/ubifs/misc.h | 2 +-
> fs/ufs/super.c | 2 +-
> fs/xfs/xfs_trans_ail.c | 2 +-
> include/linux/exportfs.h | 2 +-
> include/linux/ipv6.h | 2 +-
> include/linux/mtd/pfow.h | 2 +-
> include/linux/usb/gadget.h | 2 +-
> include/linux/wimax/debug.h | 2 +-
> include/sound/soc-dai.h | 2 +-
> kernel/perf_counter.c | 2 +-
> net/atm/lec.c | 2 +-
> net/dccp/ipv4.c | 2 +-
> net/ipv4/netfilter/nf_nat_pptp.c | 2 +-
> net/netfilter/nf_conntrack_pptp.c | 2 +-
> net/rds/ib_cm.c | 2 +-
> net/rds/iw_cm.c | 2 +-
> net/sctp/sm_make_chunk.c | 2 +-
> net/sunrpc/svcsock.c | 2 +-
> scripts/Kbuild.include | 2 +-
> scripts/namespace.pl | 2 +-
> sound/isa/cs423x/cs4236_lib.c | 2 +-
> sound/isa/es18xx.c | 2 +-
> 81 files changed, 86 insertions(+), 86 deletions(-)
>
On Fri, 10 Jul 2009, Jaswinder Singh Rajput wrote:
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6.git master
> >
> > Jaswinder Singh Rajput (16):
> > trivial: fix typo "a a" in multiple files
> > trivial: fix typo "as as" in multiple files
> > trivial: fix typo "be be" in multiple files
> > trivial: fix typo "bit bit" in multiple files
> > trivial: fix typo "by by" in multiple files
> > trivial: fix typo "can can"
> > trivial: fix typo "could could" in multiple files
> > trivial: fix typo "from from" in multiple files
> > trivial: fix typo "lock lock"
> > trivial: fix typo "should should" in multiple files
> > trivial: fix typo "test test"
> > trivial: fix typo "too too"
> > trivial: fix typo "was was" in multiple files
> > trivial: fix typo "we we" in multiple files
> > trivial: fix typo "with with" in multiple files
> > trivial: fix typo "you you"
> >
> Have you pulled these patches.
> Please Let me know if you face any issues.
Already up-to-date.
I wanted to pull and review the changes, but seems like you forgot to
push.
--
Jiri Kosina
SUSE Labs
On Fri, 2009-07-10 at 10:42 +0200, Jiri Kosina wrote:
> On Fri, 10 Jul 2009, Jaswinder Singh Rajput wrote:
>
> > > are available in the git repository at:
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6.git master
> > >
> > > Jaswinder Singh Rajput (16):
> > > trivial: fix typo "a a" in multiple files
> > > trivial: fix typo "as as" in multiple files
> > > trivial: fix typo "be be" in multiple files
> > > trivial: fix typo "bit bit" in multiple files
> > > trivial: fix typo "by by" in multiple files
> > > trivial: fix typo "can can"
> > > trivial: fix typo "could could" in multiple files
> > > trivial: fix typo "from from" in multiple files
> > > trivial: fix typo "lock lock"
> > > trivial: fix typo "should should" in multiple files
> > > trivial: fix typo "test test"
> > > trivial: fix typo "too too"
> > > trivial: fix typo "was was" in multiple files
> > > trivial: fix typo "we we" in multiple files
> > > trivial: fix typo "with with" in multiple files
> > > trivial: fix typo "you you"
> > >
> > Have you pulled these patches.
> > Please Let me know if you face any issues.
>
> Already up-to-date.
>
> I wanted to pull and review the changes, but seems like you forgot to
> push.
>
Patches was there, sorry time-out, I removed the patches one hour ago.
Thanks,
--
JSR