1. 12 Nov, 2009 31 commits
  2. 11 Nov, 2009 9 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · aa021baa
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: fix panic when trying to destroy a newly allocated
        Btrfs: allow more metadata chunk preallocation
        Btrfs: fallback on uncompressed io if compressed io fails
        Btrfs: find ideal block group for caching
        Btrfs: avoid null deref in unpin_extent_cache()
        Btrfs: skip btrfs_release_path in btrfs_update_root and btrfs_del_root
        Btrfs: fix some metadata enospc issues
        Btrfs: fix how we set max_size for free space clusters
        Btrfs: cleanup transaction starting and fix journal_info usage
        Btrfs: fix data allocation hint start
      aa021baa
    • Linus Torvalds's avatar
      btusb bluetooth driver: wait for 'waker' work too before closing · 404291ac
      Linus Torvalds authored
      Rafael debugged a resume-time hang (with oopses in workqueue handling)
      on his laptop that was due to the 'waker' workqueue entry being
      disconnected and then released without the workqueue entry having been
      synchronized.
      
      Several people were involved, with Oleg Nesterov doing a debugging patch
      showing what workqueue entry was corrupt etc.
      
      This was a regression introduced by commit 7bee549e ("Bluetooth: Add
      USB autosuspend support to btusb driver") as Rafael points out (not
      actually bisected, but it became clear once the bug was found).
      Tested-and-reported-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: default avatarOliver Neukum <oliver@neukum.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Marcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      404291ac
    • Josef Bacik's avatar
      Btrfs: fix panic when trying to destroy a newly allocated · a6dbd429
      Josef Bacik authored
      There is a problem where iget5_locked will look for an inode, not find it, and
      then subsequently try to allocate it.  Another CPU will have raced in and
      allocated the inode instead, so when iget5_locked gets the inode spin lock again
      and does a search, it finds the new inode.  So it goes ahead and calls
      destroy_inode on the inode it just allocated.  The problem is we don't set
      BTRFS_I(inode)->root until the new inode is completely initialized.  This patch
      makes us set root to NULL when alloc'ing a new inode, so when we get to
      btrfs_destroy_inode and we see that root is NULL we can just free up the memory
      and continue on.  This fixes the panic
      
      http://www.kerneloops.org/submitresult.php?number=812690
      
      Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      a6dbd429
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · fd801452
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        JBD/JBD2: free j_wbuf if journal init fails.
        ext3: Wait for proper transaction commit on fsync
        ext3: retry failed direct IO allocations
      fd801452
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 79a8f1b1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - possible read past array alc88[02]_parse_auto_config()
        sound: rawmidi: fix MIDI device O_APPEND error handling
        sound: rawmidi: fix checking of O_APPEND when opening MIDI device
        sound: rawmidi: fix double init when opening MIDI device with O_APPEND
        ALSA: hda - Avoid quirk for HP dc5750
        ALSA: hda - Tweak OLPC XO-1.5 microphone bias
        ALSA: hda: Use model=auto quirk for Sony VAIO VGN-FW170J using ALC262
      79a8f1b1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 55871bdd
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        x86/PCI: Adjust GFP mask handling for coherent allocations
        PCI ASPM: fix oops on root port removal
      55871bdd
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · e5d45abe
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: pasemi_defconfig update
        powerpc: 2.6.32 update of defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
        powerpc/8xxx: enable IPsec ESP by default on mpc83xx/mpc85xx
        powerpc/83xx: Fix u-boot partion size for MPC8377E-WLAN boards
        powerpc/85xx: Fix USB GPIOs for MPC8569E-MDS boards
        powerpc/82xx: kmalloc failure ignored in ep8248e_mdio_probe()
        powerpc/85xx: sbc8548 - fixup of PCI-e related DTS fields
      e5d45abe
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 749f3cbe
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: Use a definition for the userspace cmpxchg emulation syscall
        [ARM] Fix test for unimplemented ARM syscalls
        ARM: 5784/1: fix early boot machine ID mismatch error display
        [ARM] orion5x: update defconfig
        [ARM] Kirkwood: update defconfig
        [ARM] Kirkwood: clarify PCIe MEM bus/physical address distinction
        [ARM] kirkwood: fix PCI I/O port assignment
        [ARM] kirkwood: fix section mismatch
        [ARM] OpenRD base: Initialize PCI express and i2c
        [ARM] properly report mv78100 stepping A1
        ARM: 5780/1: KS8695: Fix macro definition bug in regs-switch.c
        ARM: 5779/1: ep93xx/micro9.c: fix implicit declaration of function __raw_readl and IOMEM
        RealView: Add sparsemem support for the RealView PBX platform
        RealView: Remove duplicated #define REALVIEW_SYS_FLAGS* statements
        RealView: Add default memory configuration
        Check whether the SCU was already initialised
        ARMv7: Check whether the SMP/nAMP mode was already enabled
        [ARM] pxa: fix resume failure by saving/restoring IPRx registers
        [ARM] pxa/palm: fix incorrect initialization of Palm Tungsten C keyboard
        [ARM] pxa/zaurus: fix NAND flash OOB layout for Borzoi
      749f3cbe
    • Linus Torvalds's avatar
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 6b46362c
      Linus Torvalds authored
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (52 commits)
        drm/kms: Init the CRTC info fields for modes forced from the command line.
        drm/radeon/r600: CS parser updates
        drm/radeon/kms: add debugfs for power management for AtomBIOS devices
        drm/radeon/kms: initial mode validation support
        drm/radeon/kms/atom/dce3: call transmitter init on mode set
        drm/radeon/kms: store detailed connector info
        drm/radeon/kms/atom/dce3: fix up usPixelClock calculation for Transmitter tables
        drm/radeon/kms/r600: fix rs880 support v2
        drm/radeon/kms/r700: fix some typos in chip init
        drm/radeon/kms: remove some misleading debugging output
        drm/radeon/kms: stop putting VRAM at 0 in MC space on r600s.
        drm/radeon/kms: disable D1VGA and D2VGA if enabled
        drm/radeon/kms: Don't RMW CP_RB_CNTL
        drm/radeon/kms: fix coherency issues on AGP cards.
        drm/radeon/kms: fix rc410 suspend/resume.
        drm/radeon/kms: add quirk for hp dc5750
        drm/radeon/kms/atom: fix potential oops in spread spectrum code
        drm/kms: typo fix
        drm/radeon/kms/atom: Make card_info per device
        drm/radeon/kms/atom: Fix DVO support
        ...
      6b46362c