Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.18-rc1

Jul 06, 2006

  1. Linux 2.6.18-rc1

    It's all good.
    Linus Torvalds authored
  2. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [PKT_SCHED]: Fix error handling while dumping actions
      [PKT_SCHED]: Return ENOENT if action module is unavailable
      [PKT_SCHED]: Fix illegal memory dereferences when dumping actions
    Linus Torvalds authored
  3. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

    * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.
      [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.
    Linus Torvalds authored
  4. Thomas Graf

    [PKT_SCHED]: Fix error handling while dumping actions

    "return -err" and blindly inheriting the error code in the netlink
    failure exception handler causes errors codes to be returned as
    positive value therefore making them being ignored by the caller.
    
    May lead to sending out incomplete netlink messages.
    
    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    tgraf authored davem330 committed
  5. Thomas Graf

    [PKT_SCHED]: Return ENOENT if action module is unavailable

    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    tgraf authored davem330 committed
  6. Thomas Graf

    [PKT_SCHED]: Fix illegal memory dereferences when dumping actions

    The TCA_ACT_KIND attribute is used without checking its
    availability when dumping actions therefore leading to a
    value of 0x4 being dereferenced.
    
    The use of strcmp() in tc_lookup_action_n() isn't safe
    when fed with string from an attribute without enforcing
    proper NUL termination.
    
    Both bugs can be triggered with malformed netlink message
    and don't require any privileges.
    
    Signed-off-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    tgraf authored davem330 committed
  7. [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.

    The sparc64 kernel's EXPORT_SYMBOL(_mcount) is inside an
    #ifdef CONFIG_SMP. This breaks modules in non-SMP kernels
    built with stack overflow checking (CONFIG_STACK_DEBUG=y),
    as modules_install reports:
    
    WARNING: /lib/modules/2.6.17/kernel/drivers/ide/ide-cd.ko needs unknown symbol _mcount
    
    Trivially fixed by moving EXPORT_SYMBOL(_mcount) outside of
    the #ifdef CONFIG_SMP.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Mikael Pettersson authored davem330 committed
  8. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      [PCI] Add JMicron PCI ID constants
      [PATCH] ahci: Ensure that we don't grab both functions
      [PATCH] libata-core.c: restore configuration boot messages in ata_dev_configure(), v2
      [PATCH] sata_sil24: add suspend/sleep support
      [PATCH] sata_sil24: separate out sil24_init_controller()
      [PATCH] sata_sil: add suspend/sleep support
      [PATCH] sata_sil: separate out sil_init_controller()
      [PATCH] libata: reimplement controller-wide PM
      [PATCH] libata: reimplement per-dev PM
      [PATCH] libata: implement PM EH actions
      [PATCH] libata: separate out __ata_ehi_hotplugged()
      [PATCH] libata: implement ATA_EHI_NO_AUTOPSY and QUIET
      [PATCH] libata: clean up debounce parameters and improve parameter selection
      [PATCH] libata: implement ATA_EHI_RESUME_LINK
      [PATCH] libata: replace ap_lock w/ ap->lock in ata_scsi_error()
      [PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy()
      [PATCH] libata: add ap->pflags and move core dynamic flags to it
      [PATCH] libata: Conditionally set host->max_cmd_len
      [PATCH] sata_vsc: data_xfer should use mmio
    Linus Torvalds authored
  9. [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Randy Dunlap authored davem330 committed
  10. [PCI] Add JMicron PCI ID constants

    They will be used in several IDE/libata files.
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Jeff Garzik authored
  11. [PATCH] ahci: Ensure that we don't grab both functions

    When we force the chip into dual fn mode so we get PATA and AHCI we must
    be sure we don't then do anything dumb like try and grab both with the AHCI
    driver.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    root authored Jeff Garzik committed
  12. [PATCH] libata-core.c: restore configuration boot messages in ata_dev…

    …_configure(), v2
    
    This one looks better, IMHO.
    
    This restores the default libata configuration messages printed during booting.
    
    Signed-off-by: <petkov@math.uni-muenster.de>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Borislav Petkov authored Jeff Garzik committed
  13. htejun

    [PATCH] sata_sil24: add suspend/sleep support

    Add suspend/sleep support.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  14. htejun

    [PATCH] sata_sil24: separate out sil24_init_controller()

    Separate out controller initialization from sil24_init_one() into
    sil24_init_controller().  This will be used by resume.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  15. htejun

    [PATCH] sata_sil: add suspend/sleep support

    Add suspend/sleep support.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  16. htejun

    [PATCH] sata_sil: separate out sil_init_controller()

    Separate out controller initialization from sil_init_one() into
    sil_init_controller().  This will be used by resume.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  17. htejun

    [PATCH] libata: reimplement controller-wide PM

    Reimplement controller-wide PM.  ata_host_set_suspend/resume() are
    defined to suspend and resume a host_set.  While suspended, EHs for
    all ports in the host_set are pegged using ATA_FLAG_SUSPENDED and
    frozen.
    
    Because SCSI device hotplug is done asynchronously against the rest of
    libata EH and the same mutex is used when adding new device, suspend
    cannot wait for hotplug to complete.  So, if SCSI device hotplug is in
    progress, suspend fails with -EBUSY.
    
    In most cases, host_set resume is followed by device resume.  As each
    resume operation requires a reset, a single host_set-wide resume
    operation may result in multiple resets.  To avoid this, resume waits
    upto 1 second giving PM to request resume for devices.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  18. htejun

    [PATCH] libata: reimplement per-dev PM

    Reimplement per-dev PM.  The original implementation directly put the
    device into suspended mode and didn't synchronize w/ EH operations
    including hotplug.  This patch reimplements ata_scsi_device_suspend()
    and ata_scsi_device_resume() such that they request EH to perform the
    respective operations.  Both functions synchronize with hotplug such
    that it doesn't operate on detached devices.
    
    Suspend waits for completion but resume just issues request and
    returns.  This allows parallel wake up of devices and thus speeds up
    system resume.
    
    Due to sdev detach synchronization, it's not feasible to separate out
    EH requesting from sdev handling; thus, ata_device_suspend/resume()
    are removed and everything is implemented in the respective
    libata-scsi functions.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  19. htejun

    [PATCH] libata: implement PM EH actions

    Implement two PM per-dev EH actions - ATA_EH_SUSPEND and
    ATA_EH_RESUME.  Each action puts the target device into suspended mode
    and resumes from it respectively.
    
    Once a device is put to suspended mode, no EH operations other than
    RESUME is allowed on the device.  The device will stay suspended till
    it gets resumed and thus reset and revalidated.  To implement this, a
    new device state helper - ata_dev_ready() - is implemented and used in
    EH action implementations to make them operate only on attached &
    running devices.
    
    If all possible devices on a port are suspended, reset is skipped too.
    This prevents spurious events including hotplug events from disrupting
    suspended devices.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  20. htejun

    [PATCH] libata: separate out __ata_ehi_hotplugged()

    Separate out __ata_ehi_hotplugged() from ata_ehi_hotplugged().  The
    underscored version doesn't set AC_ERR_ATA_BUS.  This will be used for
    resume which is a hotplug event but not an ATA bus error.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  21. htejun

    [PATCH] libata: implement ATA_EHI_NO_AUTOPSY and QUIET

    Implement ATA_EHI_NO_AUTOPSY and QUIET.  These used to be implied by
    ATA_PFLAG_LOADING, but new power management and PMP support need to
    use these separately.  e.g. Suspend/resume operations shouldn't print
    full EH messages and resume shouldn't be recorded as an error.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  22. htejun

    [PATCH] libata: clean up debounce parameters and improve parameter se…

    …lection
    
    The names of predefined debounce timing parameters didn't exactly
    match their usages.  Rename to more generic names and implement param
    selection helper sata_ehc_deb_timing() which uses EHI_HOTPLUGGED to
    select params.
    
    Combined with the previous EHI_RESUME_LINK differentiation, this makes
    parameter selection accurate.  e.g. user scan resumes link but normal
    deb param is used instead of hotplug param.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  23. htejun

    [PATCH] libata: implement ATA_EHI_RESUME_LINK

    Implement ATA_EHI_RESUME_LINK, which indicates that the link needs to
    be resumed.  This used to be implied by ATA_EHI_HOTPLUGGED.  However,
    hotplug isn't the only event which requires link resume and separating
    this out allows other places to request link resume.  This
    differentiation also allows better debounce timing selection.
    
    This patch converts user scan to use ATA_EHI_RESUME_LINK.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  24. htejun

    [PATCH] libata: replace ap_lock w/ ap->lock in ata_scsi_error()

    ap_lock was used because &ap->host_set->lock was too long and used a
    lot.  Now that &ap->host_set->lock is replaced with ap->lock, there's
    no reason to keep ap_lock.
    
    [ed. note: that's not entirely true.  ap_lock is a local variable,
    caching the results of a de-ref.  In theory, if the compiler is smart
    enough, this patch is cosmetic.  However, since this is not a fast
    path (it is the error path), this patch is nonetheless acceptable,
    even though it _may_ introduce a performance regression.]
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  25. htejun

    [PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy()

    ata_eh_autopsy() used to directly assign determined action mask to
    ehc->i.action thus overriding actions set by some of nested analyze
    functions.  This patch makes ata_eh_autopsy() add action masks just as
    it's done in other places.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  26. htejun

    [PATCH] libata: add ap->pflags and move core dynamic flags to it

    ap->flags is way too clamped.  Separate out core dynamic flags to
    ap->pflags.  ATA_FLAG_DISABLED is a dynamic flag but left alone as
    it's referenced by a lot of LLDs and it's gonna be removed once all
    LLDs are converted to new EH.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    htejun authored Jeff Garzik committed
  27. [PATCH] libata: Conditionally set host->max_cmd_len

    In preparation for SAS attached SATA devices, which will
    not have a libata scsi_host, only setup host->max_cmd_len
    if ap->host exists.
    
    Signed-off-by: Brian King <brking@us.ibm.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Brian King authored Jeff Garzik committed
  28. Martin Hicks

    [PATCH] sata_vsc: data_xfer should use mmio

    Hi,
    
    sata_vsc is an MMIO device, and should use the correct data_xfer
    function.  This problem was introduced by:
    
       commit a6b2c5d
       Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
       Date:   Mon May 22 16:59:59 2006 +0100
    
            [PATCH] PATCH: libata. Add ->data_xfer method
    
    Signed-off-by: Martin Hicks <mort@bork.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    mohicks authored Jeff Garzik committed

Jul 05, 2006

  1. Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

    * git://git.linux-nfs.org/pub/linux/nfs-2.6:
      NLM,NFSv4: Wait on local locks before we put RPC calls on the wire
      VFS: Add support for the FL_ACCESS flag to flock_lock_file()
      NFSv4: Ensure nfs4_lock_expired() caches delegated locks
      NLM,NFSv4: Don't put UNLOCK requests on the wire unless we hold a lock
      VFS: Allow caller to determine if BSD or posix locks were actually freed
      NFS: Optimise away an excessive GETATTR call when a file is symlinked
      This fixes a panic doing the first READDIR or READDIRPLUS call when:
      NFS: Fix NFS page_state usage
      Revert "Merge branch 'odirect'"
    Linus Torvalds authored
  2. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] 3711/1: AT91 timer update
      [ARM] 3709/1: pnx4008: convert to generic irq subsystem
      [ARM] 3710/1: AT91 Serial: Use GPIO API
    Linus Torvalds authored
  3. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (39 commits)
      [PATCH] myri10ge - Export more parameters to ethtool
      [PATCH] myri10ge - Use dev_info() when printing parameters after probe
      [PATCH] myri10ge - Drop ununsed nvidia chipset id
      [PATCH] myri10ge - Drop unused pm_state
      [PATCH] Fix freeing of net device
      [PATCH] remove dead entry in net wan Kconfig
      [PATCH] NI5010 netcard cleanup
      [PATCH] lock validator: fix ns83820.c irq-flags bug
      [PATCH] pcnet32: Cleanup rx buffers after loopback test.
      [PATCH] pcnet32: Suspend the chip rather than restart when changing multicast/promisc
      [PATCH] pcnet32: Handle memory allocation failures cleanly when resizing tx/rx rings
      [PATCH] pcnet32: Use kcalloc instead of kmalloc and memset
      [PATCH] pcnet32: Fix off-by-one in get_ringparam
      [PATCH] pcnet32: Use PCI_DEVICE macro
      [PATCH] pcnet32: Fix Section mismatch error
      [PATCH] Add support for the Cicada 8201 PHY
      [PATCH] zd1211rw: disable TX queue during stop
      [PATCH] ZyDAS ZD1211 USB-WLAN driver
      [PATCH] softmac: fix build-break from 881ee69
      [PATCH] CONFIG_WIRELESS_EXT is neccessary after all
      ...
    Linus Torvalds authored
  4. [PATCH] myri10ge - Export more parameters to ethtool

    Add the IRQ line, the tx_boundary, and whether Write-combining and MSI
    are enabled to the list of parameters that are exported to ethtool.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Brice Goglin authored Jeff Garzik committed
  5. [PATCH] myri10ge - Use dev_info() when printing parameters after probe

    Displaying the interface name when listing the device parameters
    at the end of myri10ge_probe is not a good idea since udev might
    rename the interface soon afterwards.
    Print the bus id instead, using dev_info().
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Brice Goglin authored Jeff Garzik committed
  6. [PATCH] myri10ge - Drop ununsed nvidia chipset id

    The workaround for the AER capability of the nVidia chipset has been
    removed, we don't need this PCI id anymore. Drop it.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    brice@myri.com authored Jeff Garzik committed
  7. [PATCH] myri10ge - Drop unused pm_state

    The pm_state field in the myri10ge_priv structure is unused. Drop it.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    brice@myri.com authored Jeff Garzik committed
Something went wrong with that request. Please try again.