Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 24, 2008
  1. Linux 2.6.28-rc1

    authored
  2. Fix PCI hotplug printk format

    Randy Dunlap authored committed
    Fix printk format warning:
    
      drivers/pci/hotplug/acpiphp_ibm.c:207: warning: format '%08lx' expects type 'long unsigned int', but argument 3 has type 'long long unsigned int'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: remove unused resource assignment in pci_read_bridge_bases()
      PCI hotplug: shpchp: message refinement
      PCI hotplug: shpchp: replace printk with dev_printk
      PCI: add routines for debugging and handling lost interrupts
      PCI hotplug: pciehp: message refinement
      PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems
      PCI hotplug: cpqphp: fix kernel NULL pointer dereference
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits)
      tcp: Restore ordering of TCP options for the sake of inter-operability
      net: Fix disjunct computation of netdev features
      sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state
      sctp: Fix to handle SHUTDOWN in SHUTDOWN-PENDING state
      sctp: Add check for the TSN field of the SHUTDOWN chunk
      sctp: Drop ICMP packet too big message with MTU larger than current PMTU
      p54: enable 2.4/5GHz spectrum by eeprom bits.
      orinoco: reduce stack usage in firmware download path
      ath5k: fix suspend-related oops on rmmod
      [netdrvr] fec_mpc52xx: Implement polling, to make netconsole work.
      qlge: Fix MSI/legacy single interrupt bug.
      smc911x: Make the driver safer on SMP
      smc911x: Add IRQ polarity configuration
      smc911x: Allow Kconfig dependency on ARM
      sis190: add identifier for Atheros AR8021 PHY
      8139x: reduce message severity on driver overlap
      igb: add IGB_DCA instead of selecting INTEL_IOATDMA
      igb: fix tx data corruption with transition to L0s on 82575
      ehea: Fix memory hotplug support
      netdev: DM9000: remove BLACKFIN hacking in DM9000 netdev driver
      ...
  5. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      math-emu: Fix thinko in _FP_DIV
      math-emu: Fix signalling of underflow and inexact while packing result.
      sparc: Add checkstack support
      sparc: correct section of current_pc()
      sparc: correct section of apc_no_idle
      sparc64: Fix race in arch/sparc64/kernel/trampoline.S
Commits on Oct 23, 2008
  1. PCI: remove unused resource assignment in pci_read_bridge_bases()

    Zhao, Yu authored Jesse Barnes committed
    This cleanup removes the resource assignment in pci_read_bridge_bases()
    since it has taken care by pci_alloc_child_bus() when allocating the bus:
    
            /* Set up default resource pointers and names.. */
            for (i = 0; i < PCI_BRIDGE_RES_NUM; i++) {
                    child->resource[i] = &bridge->resource[PCI_BRIDGE_RESOURCES+i];
                    child->resource[i]->name = child->name;
            }
    
    Signed-off-by: Yu Zhao <yu.zhao@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  2. PCI hotplug: shpchp: message refinement

    Taku Izumi authored Jesse Barnes committed
    This patch refines messages in shpchp module.  The main changes are as
    follows:
    
     - remove the trailing "."
     - remove __func__ as much as possible
     - capitalize the first letter of messages
     - show PCI device address including its domain
    
    Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  3. PCI hotplug: shpchp: replace printk with dev_printk

    Taku Izumi authored Jesse Barnes committed
    This patch replaces printks within shpchp module with dev_printks.
    
    Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      ide: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c
      ide-disk: set non-rotational queue flag for SSD and CF devices
      ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list
      ide: Add tx4938ide driver (v2)
      TXx9: Add TX4938 ATA support (v3)
      ide: Add tx4939ide driver (v6)
      ide: two more pci_ioremap_bar() conversions
      pci: use pci_ioremap_bar() in drivers/ide
      sgiioc4: use ide_host_add() (take 2)
      sgiioc4: fix error cleanup path (take 2)
  5. Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

    authored
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
      leds/acpi: Fix merge fallout from acpi_driver_data change
      leds: Simplify logic in leds-ams-delta
      leds: Fix trigger registration race
      leds: Fix leds-class.c comment
      leds: Add driver for HP harddisk protection LEDs
      leds: leds-pca955x - Mark pca955x_led_set() static
      leds: Remove uneeded leds-cm-x270 driver
      leds: Remove uneeded strlen calls
      leds: Add leds-wrap default-trigger
      leds: Make default trigger fields const
      leds: Add backlight LED trigger
      leds: da903x: Add support for LEDs found on DA9030/DA9034
  6. Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

    authored
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] pxa: corgi backlight driver should not select ssp drivers
      [ARM] 5321/1: Kirkwood: fix typo in Makefile
      [ARM] 5320/1: fix assembly constraints in implementation of do_div()
      [ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S
      [ARM] 5316/1: AT91: oops (regression) fix on gpio irq
      [ARM] msm: vreg interface to msm7k pmic
      [ARM] msm: dma: various basic dma improvements and bugfixes
      [ARM] msm: clock: provide clk_*() api support for
      [ARM] msm: clean up iomap and devices
      [ARM] msm: add proc_comm support, necessary for clock and power control
      [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM
      [ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h
      [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers
      [ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig
      Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c"
  7. Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

    authored
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
      backlight: Add driver for Tabletkiosk Sahara TouchIT-213 Tablet PC
      backlight: da903x: Add backlight driver for DA9030/DA9034
      tosa: add support for bl/lcd driver
      backlight: add support for Sharp SL-6000 LCD and backlight drivers
  8. libata: switch to using block layer tagging support

    Jens Axboe authored committed
    libata currently has a pretty dumb ATA_MAX_QUEUE loop for finding
    a free tag to use. Instead of fixing that up, convert libata to
    using block layer tagging - gets rid of code in libata, and is also
    much faster.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. PCI: add routines for debugging and handling lost interrupts

    James Bottomley authored Jesse Barnes committed
    We're getting a lot of storage drivers blamed for interrupt misrouting
    issues.  This patch provides a standard way of reporting the problem
    ... and, if possible, correcting it.
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  10. PCI hotplug: pciehp: message refinement

    Taku Izumi authored Jesse Barnes committed
    This patch refines messages in pciehp module.  The main changes are as
    follows:
    
     - remove the trailing "."
     - remove __func__ as much as possible
     - capitalize the first letter of messages
     - show PCI device address including its domain
    
    Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  11. PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems

    Zhao, Yu authored Jesse Barnes committed
    The original ARI support code has a compatibility problem with non-ARI
    devices.  If a device doesn't support ARI, turning on ARI forwarding on
    its upper level bridge will cause undefined behavior.
    
    This fix turns on ARI forwarding only when the subordinate devices
    support it.
    
    Tested-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Yu Zhao <yu.zhao@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  12. PCI hotplug: cpqphp: fix kernel NULL pointer dereference

    Kenji Kaneshige authored Jesse Barnes committed
    The following patch fixes the regression in 2.6.27 that causes kernel
    NULL pointer dereference at cpqphp driver probe time.  This patch should
    be backported to the .27 stable series.
    
    Seems to have been introduced by
    f46753c.
    
    The root cause of this problem seems that cpqphp driver calls
    pci_hp_register() wrongly. In current implementation, cpqphp driver
    passes 'ctrl->pci_dev->subordinate' as a second parameter for
    pci_hp_register(). But because hotplug slots and it's hotplug controller
    (exists as a pci funcion) are on the same bus, it should be
    'ctrl->pci_dev->bus' instead.
    
    Cc: <stable@kernel.org>
    Tested-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  13. leds/acpi: Fix merge fallout from acpi_driver_data change

    Stephen Rothwell authored Richard Purdie committed
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
  14. @bzolnier

    ide: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c

    bzolnier authored
    Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  15. @bzolnier

    ide-disk: set non-rotational queue flag for SSD and CF devices

    bzolnier authored
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  16. @bzolnier

    ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list

    Márton Németh authored bzolnier committed
    The "TEAC CD-ROM CD-224E" cannot close its tray, so add it to the NO_AUTOCLOSE
    list. This will correct the "Can close tray" field of /proc/sys/dev/cdrom/info.
    
    Signed-off-by: Márton Németh <nm127@freemail.hu>
    Acked-by: Borislav Petkov <petkovbb@gmail.com>
    [bart: minor fixups to patch description]
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  17. @bzolnier

    ide: Add tx4938ide driver (v2)

    Atsushi Nemoto authored bzolnier committed
    This is the driver for the Toshiba TX4938 SoC EBUS controller ATA mode.
    It has custom set_pio_mode and some hacks for big endian.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Cc: ralf@linux-mips.org
    Cc: sshtylyov@ru.mvista.com
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  18. @bzolnier

    TXx9: Add TX4938 ATA support (v3)

    Atsushi Nemoto authored bzolnier committed
    Add a helper routine to register tx4938ide driver and use it on
    RBTX4938 board.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Acked-by: Ralf Baechle <ralf@linux-mips.org>
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  19. @bzolnier

    ide: Add tx4939ide driver (v6)

    Atsushi Nemoto authored bzolnier committed
    This is the driver for the Toshiba TX4939 SoC ATA controller.
    
    This controller has standard ATA taskfile registers and DMA
    command/status registers, but the register layout is swapped on big
    endian.  There are some other endian issue and some special registers
    which requires many custom dma_ops/tp_ops routines and build_dmatable.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Cc: ralf@linux-mips.org
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  20. @fenrus75 @bzolnier

    ide: two more pci_ioremap_bar() conversions

    fenrus75 authored bzolnier committed
    based on suggestion from Sergei Shtylyov, there are two more places
    where using pci_ioremap_bar() makes sense.
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  21. @fenrus75 @bzolnier

    pci: use pci_ioremap_bar() in drivers/ide

    fenrus75 authored bzolnier committed
    Use the newly introduced pci_ioremap_bar() function in drivers/ide.
    pci_ioremap_bar() just takes a pci device and a bar number, with the goal
    of making it really hard to get wrong, while also having a central place
    to stick sanity checks.
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  22. @bzolnier

    sgiioc4: use ide_host_add() (take 2)

    Sergei Shtylyov authored bzolnier committed
    Convert the driver to use ide_host_add() -- this seems to be a straightforward
    change which I'm not sure why hasn't been done yet...
    
    While doing this at last, get rid of:
    
    - useless local copy of the 'sgiioc4_port_info' variable;
    
    - unnecessary 'goto' and label...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Cc: jeremy@sgi.com
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  23. @bzolnier

    sgiioc4: fix error cleanup path (take 2)

    Sergei Shtylyov authored bzolnier committed
    The driver "forgot" to call iounmap() iff request_mem_region() call failed in
    sgiioc4_ide_setup_pci_device()...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Cc: jeremy@sgi.com
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  24. [ARM] pxa: corgi backlight driver should not select ssp drivers

    Russell King authored Russell King committed
    Resolves build errors with eseries and magician defconfigs (which
    make use of the corgi backlight driver.)
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  25. @davem330

    tcp: Restore ordering of TCP options for the sake of inter-operability

    Ilpo Järvinen authored davem330 committed
    This is not our bug! Sadly some devices cannot cope with the change
    of TCP option ordering which was a result of the recent rewrite of
    the option code (not that there was some particular reason steming
    from the rewrite for the reordering) though any ordering of TCP
    options is perfectly legal. Thus we restore the original ordering
    to allow interoperability with/through such broken devices and add
    some warning about this trap. Since the reordering just happened
    without any particular reason, this change shouldn't cost us
    anything.
    
    There are already couple of known failure reports (within close
    proximity of the last release), so the problem might be more
    wide-spread than a single device. And other reports which may
    be due to the same problem though the symptoms were less obvious.
    Analysis of one of the case revealed (with very high probability)
    that sack capability cannot be negotiated as the first option
    (SYN never got a response).
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Reported-by: Aldo Maggi <sentiniate@tiscali.it>
    Tested-by: Aldo Maggi <sentiniate@tiscali.it>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  26. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    authored
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      staging: pcc_acpi: delete obsolete driver
  27. Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (21 commits)
      [SCSI] sd: fix computation of the full size of the device
      [SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact
      [SCSI] sun3x_esp: Convert && to ||
      [SCSI] sd: remove command-size switching code
      [SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API
      [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API
      [SCSI] fix netlink kernel-doc
      [SCSI] sd: Fix handling of NO_SENSE check condition
      [SCSI] export busy state via q->lld_busy_fn()
      [SCSI] refactor sdev/starget/shost busy checking
      [SCSI] mptfusion: Increase scsi-timeouts, similariy to the LSI 4.x driver.
      [SCSI] aic7xxx: Take the LED out of diagnostic mode on PM resume
      [SCSI] aic79xx: user visible misuse wrong SI units (not disk size!)
      [SCSI] ipr: use memory_read_from_buffer()
      [SCSI] aic79xx: fix shadowed variables
      [SCSI] aic79xx: fix shadowed variables, add statics
      [SCSI] aic7xxx: update *_shipped files
      [SCSI] aic7xxx: update .reg files
      [SCSI] aic7xxx: introduce "dont_generate_debug_code" keyword in aicasm parser
      [SCSI] scsi_dh: Initialize path state to be passive when path is not owned
      ...
  28. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: fix section mismatch warning - apic_x2apic_phys
      x86: fix section mismatch warning - apic_x2apic_cluster
      x86: fix section mismatch warning - apic_x2apic_uv_x
      x86: fix section mismatch warning - apic_physflat
      x86: fix section mismatch warning - apic_flat
      x86: memtest fix use of reserve_early()
      x86 syscall.h: fix argument order
      x86/tlb_uv: remove strange mc146818rtc include
      x86: remove redundant KERN_DEBUG on pr_debug
      x86: do_boot_cpu - check if we have ESR register
      x86: MAINTAINERS change for AMD microcode patch loader
      x86/proc: fix /proc/cpuinfo cpu offline bug
      x86: call dmi-quirks for HP Laptops after early-quirks are executed
      x86, kexec: fix hang on i386 when panic occurs while console_sem is held
      MCE: Don't run 32bit machine checks with interrupts on
      x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC
      x86: make variables static
  29. @lenb

    staging: pcc_acpi: delete obsolete driver

    lenb authored
    pcc_acpi is based on an old version
    of drivers/misc/panasonic-laptop.c
    
    Signed-off-by: Len Brown <len.brown@intel.com>
  30. Fix compile warning in kernel/params.c

    authored
    Move free_module_param_attrs() into the CONFIG_MODULES section, since
    it's only used inside there. Thus avoiding the warning
    
      kernel/params.c:514: warning: 'free_module_param_attrs' defined but not used
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.