Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 1, 2009
  1. @torvalds

    Linux 2.6.31-rc5

    torvalds authored
Commits on Jul 31, 2009
  1. @torvalds

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

    torvalds authored
    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: bump up nr_to_write in xfs_vm_writepage
      xfs: reduce bmv_count in xfs_vn_fiemap
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      io context: fix ref counting
      block: make the end_io functions be non-GPL exports
      block: fix improper kobject release in blk_integrity_unregister
      block: always assign default lock to queues
      mg_disk: Add missing ready status check on mg_write()
      mg_disk: fix issue with data integrity on error in mg_write()
      mg_disk: fix reading invalid status when use polling driver
      mg_disk: remove prohibited sleep operation
  3. @torvalds

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

    torvalds authored
    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      clocksource: Save mult_orig in clocksource_disable()
  4. @torvalds

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

    torvalds authored
    …/git/drzeus/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
      mmc: orphan subsystem
      imxmmc: Remove unnecessary semicolons
      cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG
      sdhci: use SG_MITER_TO_SG/SG_MITER_FROM_SG
      lib/scatterlist: add a flags to signalize mapping direction
  5. @torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: sound/aoa: Add kmalloc NULL tests
      ALSA: hda - Increase PCM stream name buf in patch_realtek.c
      sound: mpu401.c: Buffer overflow
      sound: aedsp16: Buffer overflow
      ALSA: hda: fix out-of-bound hdmi_eld.sad[] write
      ALSA: hda - Add quirk for Dell Studio 1555
  6. clocksource: Save mult_orig in clocksource_disable()

    Magnus Damm authored Ingo Molnar committed
    To fix the common case where ->enable() does not set up
    mult, make sure mult_orig is saved in mult on disable.
    
    Also add comments to explain why we do this.
    
    Signed-off-by: Magnus Damm <damm@igel.co.jp>
    Cc: johnstul@us.ibm.com
    Cc: lethal@linux-sh.org
    Cc: akpm@linux-foundation.org
    LKML-Reference: <20090618152432.10136.9932.sendpatchset@rx1.opensource.se>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  7. mmc: orphan subsystem

    Pierre Ossman authored
    I do not have the time to take care of this, so remove myself as
    maintainer.
    
    Signed-off-by: Pierre Ossman <pierre@ossman.eu>
  8. imxmmc: Remove unnecessary semicolons

    Joe Perches authored Pierre Ossman committed
    Signed-off-by: Joe Perches <joe@perches.com>
    Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
    Signed-off-by: Pierre Ossman <pierre@ossman.eu>
  9. cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG

    Sebastian Andrzej Siewior authored Pierre Ossman committed
    the code allready uses flush_kernel_dcache_page(). This patch updates the
    driver to the recent sg API changes which require that either SG_MITER_TO_SG
    or SG_MITER_FROM_SG is set. SG_MITER_TO_SG calls flush_kernel_dcache_page()
    in sg_mitter_stop()
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
    Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
    Signed-off-by: Pierre Ossman <pierre@ossman.eu>
  10. sdhci: use SG_MITER_TO_SG/SG_MITER_FROM_SG

    Sebastian Andrzej Siewior authored Pierre Ossman committed
    so the page will be flushed on unmap on ARCH which need it.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
    Signed-off-by: Pierre Ossman <pierre@ossman.eu>
  11. lib/scatterlist: add a flags to signalize mapping direction

    Sebastian Andrzej Siewior authored Pierre Ossman committed
    sg_miter_start() is currently unaware of the direction of the copy
    process (to or from the scatter list). It is important to know the
    direction because the page has to be flushed in case the data written
    is seen on a different mapping in user land on cache incoherent
    architectures.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
    Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Pierre Ossman <pierre@ossman.eu>
  12. @tiwai

    Merge branch 'fix/oss' into for-linus

    tiwai authored
    * fix/oss:
      sound: mpu401.c: Buffer overflow
      sound: aedsp16: Buffer overflow
  13. @tiwai

    Merge branch 'fix/misc' into for-linus

    tiwai authored
    * fix/misc:
      ALSA: sound/aoa: Add kmalloc NULL tests
  14. @tiwai

    Merge branch 'fix/hda' into for-linus

    tiwai authored
    * fix/hda:
      ALSA: hda - Increase PCM stream name buf in patch_realtek.c
      ALSA: hda: fix out-of-bound hdmi_eld.sad[] write
      ALSA: hda - Add quirk for Dell Studio 1555
  15. @JuliaLawall @tiwai

    ALSA: sound/aoa: Add kmalloc NULL tests

    JuliaLawall authored tiwai committed
    Check that the result of kzalloc is not NULL before a dereference.
    
    The semantic match that finds this problem is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression *x;
    identifier f;
    constant char *C;
    @@
    
    x = \(kmalloc\|kcalloc\|kzalloc\)(...);
    ... when != x == NULL
        when != x != NULL
        when != (x || ...)
    (
    kfree(x)
    |
    f(...,C,...,x,...)
    |
    *f(...,x,...)
    |
    *x->f
    )
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  16. @tiwai

    ALSA: hda - Increase PCM stream name buf in patch_realtek.c

    tiwai authored
    The name buf with size 16 is too short for some codec names, e.g.
    truncated like "ALC861-VD Analo".  Now the size is doubled.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  17. io context: fix ref counting

    Li Zefan authored Jens Axboe committed
    Commit d9c7d39
    ("block: prevent possible io_context->refcount overflow") mistakenly
    changed atomic_inc(&ioc->nr_tasks) to atomic_long_inc(&ioc->refcount).
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Acked-by: Nikanth Karthikesan <knikanth@suse.de>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  18. @sandeen

    xfs: bump up nr_to_write in xfs_vm_writepage

    sandeen authored Felix Blyakher committed
    VM calculation for nr_to_write seems off.  Bump it way
    up, this gets simple streaming writes zippy again.
    To be reviewed again after Jens' writeback changes.
    
    Signed-off-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
    Cc: Chris Mason <chris.mason@oracle.com>
    Reviewed-by: Felix Blyakher <felixb@sgi.com>
    Signed-off-by: Felix Blyakher <felixb@sgi.com>
  19. @sandeen

    xfs: reduce bmv_count in xfs_vn_fiemap

    sandeen authored Felix Blyakher committed
    commit 6321e3e caused
    the full bmv_count's worth of getbmapx structures to get
    allocated; telling it to do MAXEXTNUM was a bit insane,
    resulting in ENOMEM every time.
    
    Chop it down to something reasonable, the number of slots
    in the caller's input buffer.  If this is too large the
    caller may get ENOMEM but the reason should not be a
    mystery, and they can try again with something smaller.
    
    We add 1 to the value because in the normal getbmap
    world, bmv_count includes the header and xfs_getbmap does:
    
            nex = bmv->bmv_count - 1;
            if (nex <= 0)
                    return XFS_ERROR(EINVAL);
    
    Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
    Reviewed-by: Olaf Weber <olaf@sgi.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Felix Blyakher <felixb@sgi.com>
Commits on Jul 30, 2009
  1. @torvalds

    Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      tracing/stat: Fix seqfile memory leak
      function-graph: Fix seqfile memory leak
      trace_stack: Fix seqfile memory leak
      profile: Suppress warning about large allocations when profile=1 is specified
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: be more polite in the async caching threads
      Btrfs: preserve commit_root for async caching
  3. @torvalds

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

    torvalds authored
    …djbw/async_tx
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      dmaengine: at_hdmac: add DMA slave transfers
      dmaengine: at_hdmac: new driver for the Atmel AHB DMA Controller
      dmaengine: dmatest: correct thread_count while using multiple thread per channel
      dmaengine: dmatest: add a maximum number of test iterations
      drivers/dma: Remove unnecessary semicolons
      drivers/dma/fsldma.c: Remove unnecessary semicolons
      dmaengine: move HIGHMEM64G restriction to ASYNC_TX_DMA
      fsldma: do not clear bandwidth control bits on the 83xx controller
      fsldma: enable external start for the 83xx controller
      fsldma: use PCI Read Multiple command
  4. @torvalds

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

    torvalds authored
    …/git/jack/linux-udf-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
      udf: Fix loading of VAT inode when drive wrongly reports number of recorded blocks
  5. @torvalds

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

    torvalds authored
    …/git/jack/linux-quota-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6:
      quota: Silence lockdep on quota_on
  6. @torvalds

    Merge git://git.infradead.org/users/cbou/battery-2.6.31

    torvalds authored
    * git://git.infradead.org/users/cbou/battery-2.6.31:
      Add ds2782 battery gas gauge driver
      olpc_battery: Ensure that the TRICKLE bit is checked
      olpc_battery: Fix up eeprom read function
  7. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      GFS2: remove dcache entries for remote deleted inodes
      GFS2: Fix incorrent statfs consistency check
      GFS2: Don't put unlikely reclaim candidates on the reclaim list.
      GFS2: Don't try and dealloc own inode
      GFS2: Fix panic in glock memory shrinker
      GFS2: keep statfs info in sync on grows
      GFS2: Shrink the shrinker
  8. @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: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
      powerpc/86xx: Update GE Fanuc sbc310 default configuration
      powerpc/86xx: Update defconfig for GE Fanuc's PPC9A
      cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c
      powerpc/83xx: Fix PCI IO base address on MPC837xE-RDB boards
      powerpc/85xx: Don't scan for TBI PHY addresses on MPC8569E-MDS boards
      powerpc/85xx: Fix ethernet link detection on MPC8569E-MDS boards
      powerpc/mm: Fix SMP issue with MMU context handling code
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    torvalds authored
    …or-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      lguest and virtio: cleanup struct definitions to Linux style.
      lguest: update commentry
      lguest: fix comment style
      virtio: refactor find_vqs
      virtio: delete vq from list
      virtio: fix memory leak on device removal
      lguest: fix descriptor corruption in example launcher
      lguest: dereferencing freed mem in add_eventfd()
  10. @torvalds

    kprobes: Use kernel_text_address() for checking probe address

    Masami Hiramatsu authored torvalds committed
    Use kernel_text_address() for checking probe address instead of
    __kernel_text_address(), because __kernel_text_address() returns true
    for init functions even after relaseing those functions.
    
    That will hit a BUG() in text_poke().
    
    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
    Cc: Jim Keniston <jkenisto@us.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @torvalds

    Alan doesn't want to maintain tty code any more

    torvalds authored
    Not that anybody can blame him.  It's a morass.  But hey, it's way
    better than it _used_ to be, though, so thanks for all the fish.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @jankara

    quota: Silence lockdep on quota_on

    jankara authored
    Commit d01730d didn't completely fix
    the problem since we still take dqio_mutex and i_mutex in the wrong
    order. Move taking of i_mutex further down (luckily it's needed only
    for updating inode flags) below where dqio_mutex is taken.
    
    Tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
    Signed-off-by: Jan Kara <jack@suse.cz>
  13. @jankara

    udf: Fix loading of VAT inode when drive wrongly reports number of re…

    jankara authored
    …corded blocks
    
    VAT inode is located in the last block recorded block of the medium. When the
    drive errorneously reports number of recorded blocks, we failed to load the VAT
    inode and thus mount the medium. This patch makes kernel try to read VAT inode
    from the last block of the device if it is different from the last recorded
    block.
    
    Signed-off-by: Jan Kara <jack@suse.cz>
  14. @chrismason-xx

    Btrfs: be more polite in the async caching threads

    chrismason-xx authored
    The semaphore used by the async caching threads can prevent a
    transaction commit, which can make the FS appear to stall.  This
    releases the semaphore more often when a transaction commit is
    in progress.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  15. @chrismason-xx

    Btrfs: preserve commit_root for async caching

    Yan Zheng authored chrismason-xx committed
    The async block group caching code uses the commit_root pointer
    to get a stable version of the extent allocation tree for scanning.
    This copy of the tree root isn't going to change and it significantly
    reduces the complexity of the scanning code.
    
    During a commit, we have a loop where we update the extent allocation
    tree root.  We need to loop because updating the root pointer in
    the tree of tree roots may allocate blocks which may change the
    extent allocation tree.
    
    Right now the commit_root pointer is changed inside this loop.  It
    is more correct to change the commit_root pointer only after all the
    looping is done.
    
    Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
Something went wrong with that request. Please try again.