please pull from the trivial tree
Subsystems (11)
Linus, please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
This tree contains the following:
Adrian Bunk:
Documentation/dvb/get_dvb_firmware: fix firmware URL
Alexey Dobriyan:
It's UTF-8
Ian McDonald:
Documentation: Update to BUG-HUNTING
James Ring:
Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description
Lucas Correia Villa Real:
fix rwlock usage example
Michal Wronski:
Remove superfluous NOTIFY_COOKIE_LEN define
Rytchkov Alexey:
fixed path to moved file in include/linux/device.h
Uwe Zeisberger:
Fix "frist", "fisrt", typos
add "tags" to .gitignore
.gitignore | 1 Documentation/BUG-HUNTING | 113 +++++++++++++++++++++++++++ Documentation/dvb/get_dvb_firmware | 2 Documentation/filesystems/isofs.txt | 4 Documentation/filesystems/jfs.txt | 2 Documentation/filesystems/vfat.txt | 6 - Documentation/spinlocks.txt | 2 drivers/base/platform.c | 2 drivers/block/cciss.c | 2 drivers/net/Kconfig | 2 drivers/s390/net/claw.c | 2 drivers/scsi/megaraid/megaraid_sas.c | 2 fs/befs/linuxvfs.c | 2 fs/cifs/CHANGES | 2 fs/fat/dir.c | 2 fs/fat/inode.c | 2 fs/isofs/joliet.c | 2 fs/nls/Kconfig | 2 include/asm-mips/termbits.h | 2 include/linux/device.h | 2 include/linux/msdos_fs.h | 2 ipc/mqueue.c | 1 22 files changed, 136 insertions(+), 23 deletions(-)
.gitignore +1 -0
@@ -16,6 +16,7 @@ # # Top-level generic files # +tags vmlinux* System.map Module.symvers
Documentation/BUG-HUNTING +113 -0
119 lines not on this page · raw message
Documentation/dvb/get_dvb_firmware +1 -1
@@ -246,7 +246,7 @@ sub vp7041 { } sub dibusb { - my $url = "http://www.linuxtv.org/downloads/firmware/dvb-dibusb-5.0.0.11.fw"; + my $url = "http://www.linuxtv.org/downloads/firmware/dvb-usb-dibusb-5.0.0.11.fw"; my $outfile = "dvb-dibusb-5.0.0.11.fw"; my $hash = "fa490295a527360ca16dcdf3224ca243";
Documentation/filesystems/isofs.txt +2 -2
@@ -9,9 +9,9 @@ when using discs encoded using Microsoft iocharset=name Character set to use for converting from Unicode to ASCII. Joliet filenames are stored in Unicode format, but Unix for the most part doesn't know how to deal with Unicode. - There is also an option of doing UTF8 translations with the + There is also an option of doing UTF-8 translations with the utf8 option. - utf8 Encode Unicode names in UTF8 format. Default is no. + utf8 Encode Unicode names in UTF-8 format. Default is no. Mount options unique to the isofs filesystem. block=512 Set the block size for the disk to 512 bytes
Documentation/filesystems/jfs.txt +1 -1
@@ -6,7 +6,7 @@ The following mount options are supporte iocharset=name Character set to use for converting from Unicode to ASCII. The default is to do no conversion. Use - iocharset=utf8 for UTF8 translations. This requires + iocharset=utf8 for UTF-8 translations. This requires CONFIG_NLS_UTF8 to be set in the kernel .config file. iocharset=none specifies the default behavior explicitly.
Documentation/filesystems/vfat.txt +3 -3
@@ -28,16 +28,16 @@ iocharset=name -- Character set to use f know how to deal with Unicode. By default, FAT_DEFAULT_IOCHARSET setting is used. - There is also an option of doing UTF8 translations + There is also an option of doing UTF-8 translations with the utf8 option. NOTE: "iocharset=utf8" is not recommended. If unsure, you should consider the following option instead. -utf8=<bool> -- UTF8 is the filesystem safe version of Unicode that +utf8=<bool> -- UTF-8 is the filesystem safe version of Unicode that is used by the console. It can be be enabled for the filesystem with this option. If 'uni_xlate' gets set, - UTF8 gets disabled. + UTF-8 gets disabled. uni_xlate=<bool> -- Translate unhandled Unicode characters to special escaped sequences. This would let you backup and
Documentation/spinlocks.txt +1 -1
@@ -9,7 +9,7 @@ removed soon. So for any new code dynami static int __init xxx_init(void) { spin_lock_init(&xxx_lock); - rw_lock_init(&xxx_rw_lock); + rwlock_init(&xxx_rw_lock); ... }
drivers/base/platform.c +1 -1
@@ -326,7 +326,7 @@ EXPORT_SYMBOL_GPL(platform_device_regist* platform_device_unregister - unregister a platform-level device * @pdev: platform device we're unregistering * -* Unregistration is done in 2 steps. Fisrt we release all resources +* Unregistration is done in 2 steps. First we release all resources * and remove it from the subsystem, then we drop reference count by * calling platform_device_put(). */
drivers/block/cciss.c +1 -1
@@ -2137,7 +2137,7 @@ static void start_io( ctlr_info_t *h)break ; } -/* Get the frist entry from the Request Q */ +/* Get the first entry from the Request Q */ removeQ (&(h->reqQ), c); h->Qdepth--;
drivers/net/Kconfig +1 -1
@@ -1914,7 +1914,7 @@ config E1000_DISABLE_PACKET_SPLIT depends on E1000 help Say Y here if you want to use the legacy receive path for PCI express - hadware. + hardware. If in doubt, say N.
drivers/s390/net/claw.c +1 -1
@@ -1404,7 +1404,7 @@ add_claw_reads(struct net_device *dev, sif ( privptr-> p_read_active_first ==NULL ) {#ifdef DEBUGMSG -printk (KERN_INFO "%s:%s p_read_active_frist == NULL \n" , +printk (KERN_INFO "%s:%s p_read_active_first == NULL \n" , dev->name,__FUNCTION__);printk (KERN_INFO "%s:%s Read active first/last changed \n" , dev->name,__FUNCTION__);
drivers/scsi/megaraid/megaraid_sas.c +1 -1
@@ -915,7 +915,7 @@ static int megasas_reset_bus_host(structint ret;/* -* Frist wait for all commands to complete +* First wait for all commands to complete */ ret =megasas_generic_reset (scmd);
fs/befs/linuxvfs.c +1 -1
@@ -561,7 +561,7 @@ befs_utf2nls(struct super_block *sb, con* @sb: Superblock * @src: Input string buffer in NLS format * @srclen: Length of input string in bytes -* @dest: The output string in UTF8 format +* @dest: The output string in UTF-8 format * @destlen: Length of the output buffer * * Converts input string @src, which is in the format of the loaded NLS map,
fs/cifs/CHANGES +1 -1
@@ -160,7 +160,7 @@ improperly zeroed buffer in CIFS Unix ex Version 1.25 ------------ Fix internationalization problem in cifs readdir with filenames that map to -longer UTF8 strings than the string on the wire was in Unicode. Add workaround +longer UTF-8 strings than the string on the wire was in Unicode. Add workaround for readdir to netapp servers. Fix search rewind (seek into readdir to return non-consecutive entries). Do not do readdir when server negotiates buffer size to small to fit filename. Add support for reading POSIX ACLs from
fs/fat/dir.c +1 -1
@@ -114,7 +114,7 @@ static inline int fat_get_entry(struct i }/* -* Convert Unicode 16 to UTF8, translated Unicode, or ASCII. +* Convert Unicode 16 to UTF-8, translated Unicode, or ASCII. * If uni_xlate is enabled and we can't get a 1:1 conversion, use a * colon as an escape character since it is normally invalid on the vfat * filesystem. The following four characters are the hexadecimal digits
fs/fat/inode.c +1 -1
@@ -1101,7 +1101,7 @@ static int parse_options(char *options,return -EINVAL ; } } -/* UTF8 doesn't provide FAT semantics */ +/* UTF-8 doesn't provide FAT semantics */ if (!strcmp (opts->iocharset,"utf8" )) {printk (KERN_ERR "FAT: utf8 is not a recommended IO charset" " for FAT filesystems, filesystem will be case sensitive!\n" );
fs/isofs/joliet.c +1 -1
@@ -11,7 +11,7 @@#include "isofs.h" /* -* Convert Unicode 16 to UTF8 or ASCII. +* Convert Unicode 16 to UTF-8 or ASCII. */ static int uni16_to_x8 (unsigned char *ascii,u16 *uni,int len,struct nls_table *nls)
fs/nls/Kconfig +1 -1
@@ -491,7 +491,7 @@ config NLS_KOI8_U (koi8-u) and Belarusian (koi8-ru) character sets. config NLS_UTF8 - tristate "NLS UTF8" + tristate "NLS UTF-8" depends on NLS help If you want to display filenames with native language characters
include/asm-mips/termbits.h +1 -1
@@ -77,7 +77,7 @@ struct termios {#define IXANY 0004000/* Any character will restart after stop. */ #define IXOFF 0010000/* Enable start/stop input control. */ #define IMAXBEL 0020000/* Ring bell when input queue is full. */ -#define IUTF8 0040000/* Input is UTF8 */ +#define IUTF8 0040000/* Input is UTF-8 */ /* c_oflag bits */ #define OPOST 0000001/* Perform output processing. */
include/linux/device.h +1 -1
@@ -399,7 +399,7 @@ extern struct device * get_device(structextern void put_device (struct device * dev); -/* drivers/base/power.c */ +/* drivers/base/power/shutdown.c */ extern void device_shutdown (void );
include/linux/msdos_fs.h +1 -1
@@ -199,7 +199,7 @@ struct fat_mount_options { sys_immutable:1, /* set = system files are immutable */ dotsOK:1, /* set = hidden and system files are named '.filename' */ isvfat:1, /* 0=no vfat long filename support, 1=vfat support */ - utf8:1, /* Use of UTF8 character set (Default) */ + utf8:1, /* Use of UTF-8 character set (Default) */ unicode_xlate:1, /* create escape sequences for unhandled Unicode */ numtail:1, /* Does first alias have a numeric '~1' type tail? */ atari:1, /* Use Atari GEMDOS variation of MS-DOS fs */
ipc/mqueue.c +0 -1
@@ -51,7 +51,6 @@#define HARD_MSGMAX (131072/sizeof(void*))#define DFLT_MSGSIZEMAX 8192/* max message size */ -#define NOTIFY_COOKIE_LEN 32struct ext_wait_queue {/* queue of sleeping tasks */ struct task_struct *task;