From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 23 Oct 2007 23:37:29 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Tag: v2.6.24-rc1~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1212663fba7c5e003e05d24f043d5ed57eb18b24;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (39 commits)
  [SCSI] qla2xxx: Update version number to 8.02.00-k5.
  [SCSI] qla2xxx: Correct display of ISP serial-number.
  [SCSI] qla2xxx: Correct residual-count handling discrepancies during UNDERRUN handling.
  [SCSI] qla2xxx: Make driver (mostly) legacy I/O port free.
  [SCSI] qla2xxx: Fix issue where final flash-segment updates were falling into the slow-path write handler.
  [SCSI] qla2xxx: Handle unaligned sector writes during NVRAM/VPD updates.
  [SCSI] qla2xxx: Defer explicit interrupt-polling processing to init-time scenarios.
  [SCSI] qla2xxx: Resync with latest HBA SSID specification -- 2.2u.
  [SCSI] sym53c8xx: Remove sym_xpt_async_sent_bdr
  [SCSI] sym53c8xx: Remove pci_dev pointer from sym_shcb
  [SCSI] sym53c8xx: Make interrupt handler capable of returning IRQ_NONE
  [SCSI] sym53c8xx: Get rid of IRQ_FMT and IRQ_PRM
  [SCSI] sym53c8xx: Use scmd_printk where appropriate
  [SCSI] sym53c8xx: Simplify DAC DMA handling
  [SCSI] sym53c8xx: Remove tag_ctrl module parameter
  [SCSI] sym53c8xx: Remove io_ws, mmio_ws and ram_ws elements
  [SCSI] sym53c8xx: Remove ->device_id
  [SCSI] sym53c8xx: Use pdev->revision
  [SCSI] sym53c8xx: PCI Error Recovery support
  [SCSI] sym53c8xx: Stop overriding scsi_done
  ...
---

1212663fba7c5e003e05d24f043d5ed57eb18b24
diff --cc arch/sparc64/Kconfig
index 03c4e5c1b9,5cc8847221..bd59ab0760
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@@ -460,11 -456,22 +460,9 @@@ source "drivers/Kconfig
  
  source "drivers/sbus/char/Kconfig"
  
- source "drivers/fc4/Kconfig"
- 
  source "fs/Kconfig"
  
 -menu "Instrumentation Support"
 -
 -source "arch/sparc64/oprofile/Kconfig"
 -
 -config KPROBES
 -	bool "Kprobes (EXPERIMENTAL)"
 -	depends on KALLSYMS && EXPERIMENTAL && MODULES
 -	help
 -	  Kprobes allows you to trap at almost any kernel address and
 -	  execute a callback function.  register_kprobe() establishes
 -	  a probepoint and specifies the callback.  Kprobes is useful
 -	  for kernel debugging, non-intrusive instrumentation and testing.
 -	  If in doubt, say "N".
 -endmenu
 +source "kernel/Kconfig.instrumentation"
  
  source "arch/sparc64/Kconfig.debug"