A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Browse source 
Pull trivial tree updates from Jiri Kosina:
 "As usual, mostly comment, kerneldoc and printk() fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  lpfc: Grammar s/an negative/a negative/
  ARM: lib/lib1funcs.S: fix typo s/substractions/subtractions/
  cx25821: cx25821-medusa-reg.h: fix 0x0x prefix
  lib: crc-itu-t.[ch] fix 0x0x prefix in integer constants
  rapidio: Fix kerneldoc and comment
  qla4xxx: Fix printk() in qla4_83xx_read_reset_template() and qla4_83xx_pre_loopback_config()
  treewide: Kconfig: fix wording / spelling
  usb/serial: fix grammar in Kconfig help text for FTDI_SIO
  megaraid_sas: fix kerneldoc
  netfilter: ebtables: fix comment grammar
  drm/radeon: fix comment
  isdn: fix grammar in comment
  ARM: KVM: fix comment
This commit is contained in:
Linus Torvalds 2015-06-23 14:08:54 -07:00
commit cb8a4deaf9
22 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/Kconfig
View file

@ -52,7 +52,7 @@ config SCSI_MQ_DEFAULT
This option enables the new blk-mq based I/O path for SCSI
devices by default. With the option the scsi_mod.use_blk_mq
module/boot option defaults to Y, without it to N, but it can
still be overriden either way.
still be overridden either way.
If unsure say N.

12
drivers/scsi/lpfc/lpfc_debugfs.c
View file

@ -710,7 +710,7 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
* returns a pointer to that log in the private_data field in @file.
*
* Returns:
* This function returns zero if successful. On error it will return an negative
* This function returns zero if successful. On error it will return a negative
* error value.
**/
static int
@ -760,7 +760,7 @@ out:
* returns a pointer to that log in the private_data field in @file.
*
* Returns:
* This function returns zero if successful. On error it will return an negative
* This function returns zero if successful. On error it will return a negative
* error value.
**/
static int
@ -810,7 +810,7 @@ out:
* returns a pointer to that log in the private_data field in @file.
*
* Returns:
* This function returns zero if successful. On error it will return an negative
* This function returns zero if successful. On error it will return a negative
* error value.
**/
static int
@ -852,7 +852,7 @@ out:
* returns a pointer to that log in the private_data field in @file.
*
* Returns:
* This function returns zero if successful. On error it will return an negative
* This function returns zero if successful. On error it will return a negative
* error value.
**/
static int
@ -894,7 +894,7 @@ out:
* returns a pointer to that log in the private_data field in @file.
*
* Returns:
* This function returns zero if successful. On error it will return an negative
* This function returns zero if successful. On error it will return a negative
* error value.
**/
static int
@ -1115,7 +1115,7 @@ lpfc_debugfs_dif_err_release(struct inode *inode, struct file *file)
* returns a pointer to that log in the private_data field in @file.
*
* Returns:
* This function returns zero if successful. On error it will return an negative
* This function returns zero if successful. On error it will return a negative
* error value.
**/
static int

2
drivers/scsi/megaraid/megaraid_sas_base.c
View file

@ -4747,7 +4747,7 @@ fail_ready_state:
/**
* megasas_release_mfi - Reverses the FW initialization
* @intance: Adapter soft state
* @instance: Adapter soft state
*/
static void megasas_release_mfi(struct megasas_instance *instance)
{

2
drivers/scsi/megaraid/megaraid_sas_fusion.c
View file

@ -2334,7 +2334,7 @@ megasas_issue_dcmd_fusion(struct megasas_instance *instance,
/**
* megasas_release_fusion - Reverses the FW initialization
* @intance: Adapter soft state
* @instance: Adapter soft state
*/
void
megasas_release_fusion(struct megasas_instance *instance)

2
drivers/scsi/qla4xxx/ql4_83xx.c
View file

@ -828,7 +828,7 @@ void qla4_83xx_read_reset_template(struct scsi_qla_host *ha)
ret_val = qla4_83xx_flash_read_u32(ha, addr, p_buff,
tmplt_hdr_def_size);
if (ret_val != QLA_SUCCESS) {
ql4_printk(KERN_ERR, ha, "%s: Failed to read reset tempelate\n",
ql4_printk(KERN_ERR, ha, "%s: Failed to read reset template\n",
__func__);
goto exit_read_template_error;
}

2
drivers/scsi/qla4xxx/ql4_bsg.c
View file

@ -571,7 +571,7 @@ static int qla4_83xx_pre_loopback_config(struct scsi_qla_host *ha,
if ((config & ENABLE_INTERNAL_LOOPBACK) ||
(config & ENABLE_EXTERNAL_LOOPBACK)) {
ql4_printk(KERN_INFO, ha, "%s: Loopback diagnostics already in progress. Invalid requiest\n",
ql4_printk(KERN_INFO, ha, "%s: Loopback diagnostics already in progress. Invalid request\n",
__func__);
goto exit_pre_loopback_config;
}