From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Aug 2010 22:31:02 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: upstream/snapshot3+hdmi~13782
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-next' of git://git./linux/kernel/git/jikos/trivial

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
  Documentation: update broken web addresses.
  fix comment typo "choosed" -> "chosen"
  hostap:hostap_hw.c Fix typo in comment
  Fix spelling contorller -> controller in comments
  Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
  fs/Kconfig: Fix typo Userpace -> Userspace
  Removing dead MACH_U300_BS26
  drivers/infiniband: Remove unnecessary casts of private_data
  fs/ocfs2: Remove unnecessary casts of private_data
  libfc: use ARRAY_SIZE
  scsi: bfa: use ARRAY_SIZE
  drm: i915: use ARRAY_SIZE
  drm: drm_edid: use ARRAY_SIZE
  synclink: use ARRAY_SIZE
  block: cciss: use ARRAY_SIZE
  comment typo fixes: charater => character
  fix comment typos concerning "challenge"
  arm: plat-spear: fix typo in kerneldoc
  reiserfs: typo comment fix
  update email address
  ...
---

3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4
diff --cc drivers/scsi/bfa/bfa_core.c
index bef7092,d845506..76fa5c5
--- a/drivers/scsi/bfa/bfa_core.c
+++ b/drivers/scsi/bfa/bfa_core.c
@@@ -333,10 -333,9 +333,10 @@@ bfa_get_pciids(struct bfa_pciid_s **pci
  		{BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_FC_8G2P},
  		{BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_FC_8G1P},
  		{BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_CT},
 +		{BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_CT_FC},
  	};
  
- 	*npciids = sizeof(__pciids) / sizeof(__pciids[0]);
+ 	*npciids = ARRAY_SIZE(__pciids);
  	*pciids = __pciids;
  }
  
diff --cc drivers/scsi/bfa/bfa_fcs.c
index 3ec2f49,153cb2a..d1a9920
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@@ -99,11 -99,10 +99,11 @@@ bfa_fcs_attach(struct bfa_fcs_s *fcs, s
  void
  bfa_fcs_init(struct bfa_fcs_s *fcs)
  {
 -	int             i;
 +	int i, npbc_vports;
  	struct bfa_fcs_mod_s  *mod;
 +	struct bfi_pbc_vport_s pbc_vports[BFI_PBC_MAX_VPORTS];
  
- 	for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
+ 	for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
  		mod = &fcs_modules[i];
  		if (mod->modinit)
  			mod->modinit(fcs);
diff --cc drivers/scsi/mpt2sas/mpt2sas_base.h
index 0ebef0c,41c29a8..0b15a8b
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@@ -475,9 -474,8 +475,9 @@@ typedef void (*MPT_ADD_SGE)(void *paddr
   * @shost_recovery: host reset in progress
   * @ioc_reset_in_progress_lock:
   * @ioc_link_reset_in_progress: phy/hard reset in progress
-  * @ignore_loginfos: ignore loginfos during task managment
+  * @ignore_loginfos: ignore loginfos during task management
   * @remove_host: flag for when driver unloads, to avoid sending dev resets
 + * @pci_error_recovery: flag to prevent ioc access until slot reset completes
   * @wait_for_port_enable_to_complete:
   * @msix_enable: flag indicating msix is enabled
   * @msix_vector_count: number msix vectors