Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.30-rc8
Commits on Jun 3, 2009
  1. @torvalds

    Linux 2.6.30-rc8

    torvalds authored
  2. @torvalds

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc/pmac: Update PowerMac 32-bit defconfig
Commits on Jun 2, 2009
  1. @EtchedPixels @torvalds

    parport: quickfix the proc registration bug

    EtchedPixels authored torvalds committed
    Ideally we should have a directory of drivers and a link to the 'active'
    driver. For now just show the first device which is effectively the existing
    semantics without a warning.
    
    This is an update on the original buggy patch that I then forgot to
    resubmit. Confusingly it was proposed by Red Hat, written by Etched Pixels
    fixed and submitted by Intel ...
    
    Resolves-Bug: http://bugzilla.kernel.org/show_bug.cgi?id=9749
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    pata_netcell: LBA48 force identify bits correct

    Alan Cox authored torvalds committed
    This matches Bartlomiej's patch for ide_pci_generic:
    c339dfd
    
    In the libata case netcell has its own mini driver. I suspect this fix is
    actually only needed for some firmware revs but it does no harm either way.
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup
      e1000: add missing length check to e1000 receive routine
      forcedeth: add phy_power_down parameter, leave phy powered up by default (v2)
      Bluetooth: Remove useless flush_work() causing lockdep warnings
  4. @torvalds

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    torvalds authored
    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: prevent deadlock in xfs_qm_shake()
      xfs: fix overflow in xfs_growfs_data_private
      xfs: fix double unlock in xfs_swap_extents()
  5. @davem330

    net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid k…

    Minoru Usui authored davem330 committed
    …ernel panic when we use cls_cgroup
    
    This patch fixes a bug which unconfigured struct tcf_proto keeps
    chaining in tc_ctl_tfilter(), and avoids kernel panic in
    cls_cgroup_classify() when we use cls_cgroup.
    
    When we execute 'tc filter add', tcf_proto is allocated, initialized
    by classifier's init(), and chained.  After it's chained,
    tc_ctl_tfilter() calls classifier's change().  When classifier's
    change() fails, tc_ctl_tfilter() does not free and keeps tcf_proto.
    
    In addition, cls_cgroup is initialized in change() not in init().  It
    accesses unconfigured struct tcf_proto which is chained before
    change(), then hits Oops.
    
    Signed-off-by: Minoru Usui <usui@mxm.nes.nec.co.jp>
    Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
    Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
    Tested-by: Minoru Usui <usui@mxm.nes.nec.co.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @davem330

    e1000: add missing length check to e1000 receive routine

    Neil Horman authored davem330 committed
    	Patch to fix bad length checking in e1000.  E1000 by default does two
    things:
    
    1) Spans rx descriptors for packets that don't fit into 1 skb on recieve
    2) Strips the crc from a frame by subtracting 4 bytes from the length prior to
    doing an skb_put
    
    Since the e1000 driver isn't written to support receiving packets that span
    multiple rx buffers, it checks the End of Packet bit of every frame, and
    discards it if its not set.  This places us in a situation where, if we have a
    spanning packet, the first part is discarded, but the second part is not (since
    it is the end of packet, and it passes the EOP bit test).  If the second part of
    the frame is small (4 bytes or less), we subtract 4 from it to remove its crc,
    underflow the length, and wind up in skb_over_panic, when we try to skb_put a
    huge number of bytes into the skb.  This amounts to a remote DOS attack through
    careful selection of frame size in relation to interface MTU.  The fix for this
    is already in the e1000e driver, as well as the e1000 sourceforge driver, but no
    one ever pushed it to e1000.  This is lifted straight from e1000e, and prevents
    small frames from causing the underflow described above
    
    Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
    Tested-by: Andy Gospodarek <andy@greyhouse.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    forcedeth: add phy_power_down parameter, leave phy powered up by defa…

    Ed Swierk authored davem330 committed
    …ult (v2)
    
    Add a phy_power_down parameter to forcedeth: set to 1 to power down the
    phy and disable the link when an interface goes down; set to 0 to always
    leave the phy powered up.
    
    The phy power state persists across reboots; Windows, some BIOSes, and
    older versions of Linux don't bother to power up the phy again, forcing
    users to remove all power to get the interface working (see
    http://bugzilla.kernel.org/show_bug.cgi?id=13072).  Leaving the phy
    powered on is the safest default behavior.  Users accustomed to seeing
    the link state reflect the interface state and/or wanting to minimize
    power consumption can set phy_power_down=1 if compatibility with other
    OSes is not an issue.
    
    Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. xfs: prevent deadlock in xfs_qm_shake()

    Felix Blyakher authored
    It's possible to recurse into filesystem from the memory
    allocation, which deadlocks in xfs_qm_shake(). Add check
    for __GFP_FS, and bail out if it is not set.
    
    Signed-off-by: Felix Blyakher <felixb@sgi.com>
    Signed-off-by: Hedi Berriche <hedi@sgi.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Felix Blyakher <felixb@sgi.com>
  9. @sandeen

    xfs: fix overflow in xfs_growfs_data_private

    sandeen authored Felix Blyakher committed
    In the case where growing a filesystem would leave the last AG
    too small, the fixup code has an overflow in the calculation
    of the new size with one fewer ag, because "nagcount" is a 32
    bit number.  If the new filesystem has > 2^32 blocks in it
    this causes a problem resulting in an EINVAL return from growfs:
    
     # xfs_io -f -c "truncate 19998630180864" fsfile
     # mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b fsfile
     # mount -o loop fsfile /mnt
     # xfs_growfs /mnt
    
    meta-data=/dev/loop0             isize=256    agcount=52,
    agsize=76288719 blks
             =                       sectsz=512   attr=2
    data     =                       bsize=4096   blocks=3905982455, imaxpct=5
             =                       sunit=0      swidth=0 blks
    naming   =version 2              bsize=4096   ascii-ci=0
    log      =internal               bsize=4096   blocks=32768, version=2
             =                       sectsz=512   sunit=0 blks, lazy-count=0
    realtime =none                   extsz=4096   blocks=0, rtextents=0
    xfs_growfs: XFS_IOC_FSGROWFSDATA xfsctl failed: Invalid argument
    
    Reported-by: richard.ems@cape-horn-eng.com
    Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Felix Blyakher <felixb@sgi.com>
    Signed-off-by: Felix Blyakher <felixb@sgi.com>
  10. xfs: fix double unlock in xfs_swap_extents()

    Felix Blyakher authored
    Regreesion from commit ef8f7fc, which rearranged the code in
    xfs_swap_extents() leading to double unlock of xfs inode ilock.
    That resulted in xfs_fsr deadlocking itself on platforms, which
    don't handle double unlock of rw_semaphore nicely. It caused the
    count go negative, which represents the write holder, without
    really having one. ia64 is one of the platforms where deadlock
    was easily reproduced and the fix was tested.
    
    Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
    Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
    Signed-off-by: Felix Blyakher <felixb@sgi.com>
  11. @ozbenh

    powerpc/pmac: Update PowerMac 32-bit defconfig

    ozbenh authored
    This mostly adds back AppleTouch support and adds CONFIG_HIGHMEM
    by default.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Commits on Jun 1, 2009
  1. @davem330
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: hash - Fix handling of sg entry that crosses page boundary
  3. @torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds authored
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: Update documentation on fan_max
      hwmon: (lm78) Add missing __devexit_p()
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix section attribute warnings.
      sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK.
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      3c509: Add missing EISA IDs
      MAINTAINERS: take maintainership of the cpmac Ethernet driver
      net/firmare: Ignore .cis files
      ath1e: add new device id for asus hardware
      mlx4_en: Fix a kernel panic when waking tx queue
      rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
      at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
      mac8390: fix build with NET_POLL_CONTROLLER
      cxgb3: link fault fixes
      cxgb3: fix dma mapping regression
      netfilter: nfnetlink_log: fix wrong skbuff size	calculation
      netfilter: xt_hashlimit does a wrong SEQ_SKIP
      bfin_mac: fix build error due to net_device_ops convert
      atlx: move modinfo data from atlx.h to atl1.c
      gianfar: fix babbling rx error event bug
      cls_cgroup: read classid atomically in classifier
      netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
      netfilter: nf_ct_tcp: fix accepting invalid RST segments
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers…

    torvalds authored
    …-check-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6:
      headers_check fix: linux/net_dropmon.h
      headers_check fix: linux/auto_fs.h
  7. hwmon: Update documentation on fan_max

    Christian Engelmayer authored Jean Delvare committed
    Add fan_max description.
    
    Add fan limit alarm 'max_alarm' to the alarm section.
    
    Signed-off-by: Christian Engelmayer <christian.engelmayer@frequentis.com>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  8. @vapier

    hwmon: (lm78) Add missing __devexit_p()

    vapier authored Jean Delvare committed
    The remove function uses __devexit, so the .remove assignment needs
    __devexit_p() to fix a build error with hotplug disabled.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  9. @davem330

    3c509: Add missing EISA IDs

    Maciej W. Rozycki authored davem330 committed
    Several EISA device IDs for 3c509 family network cards are missing from 
    the driver, making the cards unusable in their EISA mode.  Here's a fix to 
    add them based on the EISA configuration files distributed by 3Com and our 
    eisa.ids database.
    
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. @ffainelli @davem330

    MAINTAINERS: take maintainership of the cpmac Ethernet driver

    ffainelli authored davem330 committed
    This patch adds me as the maintainer of the CPMAC (AR7)
    Ethernet driver.
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. headers_check fix: linux/net_dropmon.h

    Jaswinder Singh Rajput authored
    fix the following 'make headers_check' warnings:
    
      usr/include/linux/net_dropmon.h:7: found __[us]{8,16,32,64} type without #include <linux/types.h>
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
  12. headers_check fix: linux/auto_fs.h

    Jaswinder Singh Rajput authored
    fix the following 'make headers_check' warnings:
    
      usr/include/linux/auto_fs.h:17: include of <linux/types.h> is preferred over <asm/types.h>
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Commits on May 31, 2009
  1. @herbertx

    crypto: hash - Fix handling of sg entry that crosses page boundary

    herbertx authored
    A quirk that we've always supported is having an sg entry that's
    bigger than a page, or more generally an sg entry that crosses
    page boundaries.  Even though it would be better to explicitly have
    to sg entries for this, we need to support it for the existing users,
    in particular, IPsec.
    
    The new ahash sg walking code did try to handle this, but there was
    a bug where we didn't increment the page so kept on walking on the
    first page over an dover again.
    
    This patch fixes it.
    
    Tested-by: Martin Willi <martin@strongswan.org>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Commits on May 30, 2009
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/bart/ide-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      ide_pci_generic: add quirk for Netcell ATA RAID
  2. @bzolnier

    ide_pci_generic: add quirk for Netcell ATA RAID

    bzolnier authored
    We need to explicitly mark words 85-87 as valid ones since
    firmware doesn't do it.
    
    This should fix support for LBA48 and FLUSH CACHE [EXT] command
    which stopped working after we applied more strict checking of
    identify words in:
    
    	commit 942dcd8
    	("ide: idedisk_supports_lba48() -> ata_id_lba48_enabled()")
    
    and
    
    	commit 4b58f17
    	("ide: ide_id_has_flush_cache() -> ata_id_flush_enabled()")
    
    Reported-and-tested-by: "Trevor Hemsley" <trevor.hemsley@ntlworld.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: fix bh leak in nilfs_cpfile_delete_checkpoints function
  4. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI, i915: build fix (v2)
      acpi-cpufreq: fix printk typo and indentation
      ACPI processor: remove spurious newline from warning message
      drm/i915: acpi/video.c fix section mismatch warning
      ACPI: video: DMI workaround broken Acer 5315 BIOS enabling display brightness
      ACPI: video: DMI workaround broken eMachines E510 BIOS enabling display brightness
      ACPI: sanity check _PSS frequency to prevent cpufreq crash
      i7300_idle: allow testing on i5000-series hardware w/o re-compile
      PCI/ACPI: fix wrong ref count handling in acpi_pci_bind()
      cpuidle: fix AMD C1E suspend hang
      cpuidle: makes AMD C1E work in acpi_idle
  5. @torvalds

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/djbw/async_tx
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      fsldma: Fix compile warnings
      fsldma: fix memory leak on error path in fsl_dma_prep_memcpy()
      fsldma: snooping is not enabled for last entry in descriptor chain
      fsldma: fix infinite loop on multi-descriptor DMA chain completion
      fsldma: fix "DMA halt timeout!" errors
      fsldma: fix check on potential fdev->chan[] overflow
      fsldma: update mailling list address in MAINTAINERS
  6. @konis

    nilfs2: fix bh leak in nilfs_cpfile_delete_checkpoints function

    konis authored
    The nilfs_cpfile_delete_checkpoints() wrongly skips brelse() for the
    header block of checkpoint file in case of errors.  This fixes the
    leak bug.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
  7. @kraai @davem330

    net/firmare: Ignore .cis files

    kraai authored davem330 committed
    Signed-off-by: Matt Kraai <kraai@ftbfs.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @gregkh @davem330

    ath1e: add new device id for asus hardware

    gregkh authored davem330 committed
    Gary Lin reports that a new device id needs to be added to the atl1e in
    order to get some new Asus hardware to work properly.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @davem330

    mlx4_en: Fix a kernel panic when waking tx queue

    Yevgeny Petrilin authored davem330 committed
    When the transmit queue gets full we enable interrupts for TX completions
    There was a race that we handled the TX queue both from the interrupt context
    and from the transmit function. Using "spin_trylock_irq()" ensures this
    doesn't happen.
    
    Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.