2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
linux-next/drivers/scsi/lpfc
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
lpfc_attr.c [SCSI] lpfc 8.3.17: SLI Additions and Fixes 2010-10-07 17:28:37 -05:00
lpfc_bsg.c [SCSI] lpfc 8.3.17: BSG fixes 2010-10-07 17:29:54 -05:00
lpfc_bsg.h [SCSI] lpfc 8.3.12: BSG Fixes and enhancements 2010-04-11 13:45:38 -05:00
lpfc_compat.h [SCSI] lpfc 8.3.16: SLI Additions, updates, and code cleanup 2010-08-06 12:09:24 -05:00
lpfc_crtn.h [SCSI] lpfc 8.3.14: SCSI and SLI API fixes 2010-07-27 12:01:38 -05:00
lpfc_ct.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
lpfc_debugfs.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
lpfc_debugfs.h [SCSI] lpfc 8.3.0 : Hook lpfc's debugfs into Kconfig 2008-12-29 11:24:28 -06:00
lpfc_disc.h [SCSI] lpfc 8.3.13: FC Discovery Fixes and enhancements. 2010-07-27 12:01:31 -05:00
lpfc_els.c [SCSI] lpfc 8.3.17: Code Cleanup and Locking fixes 2010-10-07 17:26:19 -05:00
lpfc_hbadisc.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
lpfc_hw4.h [SCSI] lpfc 8.3.12: Emulex SLI enhancements 2010-04-11 13:44:44 -05:00
lpfc_hw.h [SCSI] lpfc 8.3.17: SLI Additions and Fixes 2010-10-07 17:28:37 -05:00
lpfc_init.c [SCSI] lpfc 8.3.17: Replace function reset methodology 2010-10-07 17:30:36 -05:00
lpfc_logmsg.h [SCSI] lpfc 8.3.10: Added round robin FCF failover 2010-03-03 19:10:09 +05:30
lpfc_mbox.c [SCSI] lpfc 8.3.16: FCoE Discovery and Failover Fixes 2010-08-06 12:11:44 -05:00
lpfc_mem.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
lpfc_nl.h [SCSI] lpfc 8.3.8: (BSG1) Update BSG infrastructure 2010-02-08 18:39:02 -06:00
lpfc_nportdisc.c [SCSI] lpfc 8.3.13: Add TX Queue Support for SLI4 ELS commands. 2010-07-27 12:01:34 -05:00
lpfc_scsi.c [SCSI] lpfc 8.3.17: SCSI fixes 2010-10-07 17:30:18 -05:00
lpfc_scsi.h [SCSI] lpfc 8.3.8: BugFixes: SLI relates changes 2010-02-08 18:37:53 -06:00
lpfc_sli4.h [SCSI] lpfc 8.3.17: Replace function reset methodology 2010-10-07 17:30:36 -05:00
lpfc_sli.c [SCSI] lpfc 8.3.17: Replace function reset methodology 2010-10-07 17:30:36 -05:00
lpfc_sli.h [SCSI] lpfc 8.3.13: Add TX Queue Support for SLI4 ELS commands. 2010-07-27 12:01:34 -05:00
lpfc_version.h [SCSI] lpfc 8.3.17: Update lpfc driver version to 8.3.17 2010-10-07 17:30:54 -05:00
lpfc_vport.c [SCSI] lpfc 8.3.17: Code Cleanup and Locking fixes 2010-10-07 17:26:19 -05:00
lpfc_vport.h [SCSI] lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events 2008-10-13 09:28:57 -04:00
lpfc.h [SCSI] lpfc 8.3.16: SLI Additions, updates, and code cleanup 2010-08-06 12:09:24 -05:00
Makefile [SCSI] lpfc 8.3.4: Add bsg (SGIOv4) support for ELS/CT support 2009-08-22 17:51:59 -05:00