]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: af76bba af2709f)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
authorLinus Torvalds <[email protected]>
Tue, 23 Oct 2007 23:37:29 +0000 (16:37 -0700)
committerLinus Torvalds <[email protected]>
Tue, 23 Oct 2007 23:37:29 +0000 (16:37 -0700)
* 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
  ...

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/sparc64/Kconfig patch | diff1 | diff2 | blob | history
drivers/Makefile patch | diff1 | diff2 | blob | history
drivers/scsi/gdth.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index 40245af2d0e3611df6b0f18365910ab1d7798d9e,75fd297ea8cb9e289e1d9c5e07cb8a5df9f9810b..05504f2ff110a5d9d426f8872a911f23b815d43d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -325,6 -325,12 +325,12 @@@ M:       Juergen Fischer <[email protected]
  L:    [email protected]
  S:    Maintained
  
+ AIC7XXX / AIC79XX SCSI DRIVER
+ P:    Hannes Reinecke
+ M:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ 
  ALCATEL SPEEDTOUCH USB DRIVER
  P:    Duncan Sands
  M:    [email protected]
@@@ -1963,6 -1969,11 +1969,6 @@@ M:     [email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
  
 -INTEL APIC/IOAPIC, LOWLEVEL X86 SMP SUPPORT
 -P:    Ingo Molnar
 -M:    [email protected]
 -S:    Maintained
 -
  INTEL I8XX RANDOM NUMBER GENERATOR SUPPORT
  P:    Jeff Garzik
  M:    [email protected]
@@@ -2173,7 -2184,7 +2179,7 @@@ S:      Maintaine
  KCONFIG
  P:    Roman Zippel
  M:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  
  KDUMP
@@@ -2202,7 -2213,6 +2208,7 @@@ KERNEL BUILD (kbuild: Makefile, scripts
  P:    Sam Ravnborg
  M:    [email protected]
  T:    git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
 +L:    [email protected]
  S:    Maintained
  
  KERNEL JANITORS
@@@ -2230,7 -2240,7 +2236,7 @@@ S:      Supporte
  KEXEC
  P:    Eric Biederman
  M:    [email protected]
 -W:    http://www.xmission.com/~ebiederm/files/kexec/
 +W:    http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -2338,8 -2348,6 +2344,8 @@@ L:      [email protected]
  S:    Maintained
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
 +P:    Vitaly Bordug
 +M:    [email protected]
  P:    Marcelo Tosatti
  M:    [email protected]
  W:    http://www.penguinppc.org/
@@@ -2938,6 -2946,13 +2944,6 @@@ L:     [email protected]
  L:    [email protected]
  S:    Supported
  
 -PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
 -P:    Thomas Sailer
 -M:    [email protected]
 -L:    [email protected]
 -W:    http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html
 -S:    Maintained
 -
  PCI SUBSYSTEM
  P:    Greg Kroah-Hartman
  M:    [email protected]
@@@ -4266,15 -4281,9 +4272,15 @@@ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
 -X86 3-LEVEL PAGING (PAE) SUPPORT
 +X86 ARCHITECTURE (32-BIT AND 64-BIT)
 +P:    Thomas Gleixner
 +M:    [email protected]
  P:    Ingo Molnar
  M:    [email protected]
 +P:    H. Peter Anvin
 +M:    [email protected]
 +L:    [email protected]
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
  S:    Maintained
  
  YAM DRIVER FOR AX.25
diff --combined arch/sparc64/Kconfig
index 03c4e5c1b94a5ae3f6cda7c836b40ffee60ff127,5cc8847221be67f6c54cff28f7f8e22163238266..bd59ab0760b3fe5c75ea7ade8ffe1f1af1d6155b
--- 1/arch/sparc64/Kconfig
--- 2/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@@ -72,10 -72,6 +72,10 @@@ config ARCH_NO_VIRT_TO_BU
  config OF
        def_bool y
  
 +config GENERIC_HARDIRQS_NO__DO_IRQ
 +      bool
 +      def_bool y
 +
  choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
@@@ -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"
  
diff --combined drivers/Makefile
index 560496b43306234ebf5f6fc2274206248bad9628,8c645bcfb3c53f27c89c27bda59d6cc8a80bef16..8cb37e3557d490910efbea741a26ac9465f1db00
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -34,7 -34,6 +34,6 @@@ obj-$(CONFIG_NUBUS)           += nubus
  obj-$(CONFIG_ATM)             += atm/
  obj-y                         += macintosh/
  obj-$(CONFIG_IDE)             += ide/
- obj-$(CONFIG_FC4)             += fc4/
  obj-$(CONFIG_SCSI)            += scsi/
  obj-$(CONFIG_ATA)             += ata/
  obj-$(CONFIG_FUSION)          += message/
@@@ -66,7 -65,7 +65,7 @@@ obj-y                         += i2c
  obj-$(CONFIG_W1)              += w1/
  obj-$(CONFIG_POWER_SUPPLY)    += power/
  obj-$(CONFIG_HWMON)           += hwmon/
 -obj-$(CONFIG_WATCHDOG)                += char/watchdog/
 +obj-$(CONFIG_WATCHDOG)                += watchdog/
  obj-$(CONFIG_PHONE)           += telephony/
  obj-$(CONFIG_MD)              += md/
  obj-$(CONFIG_BT)              += bluetooth/
@@@ -76,7 -75,6 +75,7 @@@ obj-$(CONFIG_MCA)             += mca
  obj-$(CONFIG_EISA)            += eisa/
  obj-$(CONFIG_LGUEST_GUEST)    += lguest/
  obj-$(CONFIG_CPU_FREQ)                += cpufreq/
 +obj-$(CONFIG_CPU_IDLE)                += cpuidle/
  obj-$(CONFIG_MMC)             += mmc/
  obj-$(CONFIG_NEW_LEDS)                += leds/
  obj-$(CONFIG_INFINIBAND)      += infiniband/
@@@ -91,4 -89,3 +90,4 @@@ obj-$(CONFIG_HID)             += hid
  obj-$(CONFIG_PPC_PS3)         += ps3/
  obj-$(CONFIG_OF)              += of/
  obj-$(CONFIG_SSB)             += ssb/
 +obj-$(CONFIG_VIRTIO)          += virtio/
diff --combined drivers/scsi/gdth.c
index 5ab3ce762485e070e61d6aef8f6a0caf630348d5,56de5a6f2817934203af1042153a210b69c9b72a..b253b8c718d362e3215e2520e6a7eb576296474b
--- 1/drivers/scsi/gdth.c
--- 2/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@@ -2374,18 -2374,18 +2374,18 @@@ static void gdth_copy_internal_data(gdt
              if (cpsum+cpnow > cpcount) 
                  cpnow = cpcount - cpsum;
              cpsum += cpnow;
 -            if (!sl->page) {
 +            if (!sg_page(sl)) {
                  printk("GDT-HA %d: invalid sc/gt element in gdth_copy_internal_data()\n",
                         ha->hanum);
                  return;
              }
              local_irq_save(flags);
 -            address = kmap_atomic(sl->page, KM_BIO_SRC_IRQ) + sl->offset;
 +            address = kmap_atomic(sg_page(sl), KM_BIO_SRC_IRQ) + sl->offset;
              if (to_buffer)
                  memcpy(buffer, address, cpnow);
              else
                  memcpy(address, buffer, cpnow);
 -            flush_dcache_page(sl->page);
 +            flush_dcache_page(sg_page(sl));
              kunmap_atomic(address, KM_BIO_SRC_IRQ);
              local_irq_restore(flags);
              if (cpsum == cpcount)
@@@ -4734,7 -4734,7 +4734,7 @@@ static struct scsi_host_template gdth_t
  };
  
  #ifdef CONFIG_ISA
- static int gdth_isa_probe_one(ulong32 isa_bios)
+ static int __init gdth_isa_probe_one(ulong32 isa_bios)
  {
        struct Scsi_Host *shp;
        gdth_ha_str *ha;
@@@ -4862,7 -4862,7 +4862,7 @@@
  #endif /* CONFIG_ISA */
  
  #ifdef CONFIG_EISA
- static int gdth_eisa_probe_one(ushort eisa_slot)
+ static int __init gdth_eisa_probe_one(ushort eisa_slot)
  {
        struct Scsi_Host *shp;
        gdth_ha_str *ha;
@@@ -4991,7 -4991,7 +4991,7 @@@
  #endif /* CONFIG_EISA */
  
  #ifdef CONFIG_PCI
- static int gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr)
+ static int __init gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr)
  {
        struct Scsi_Host *shp;
        gdth_ha_str *ha;
Empty description
This page took 0.108625 seconds and 4 git commands to generate.