1. 20 Sep, 2011 34 commits
  2. 12 Sep, 2011 6 commits
    • Linus Torvalds's avatar
      Linux 3.1-rc6 · b6fd41e2
      Linus Torvalds authored
      b6fd41e2
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 8cb3ed17
      Linus Torvalds authored
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: Remove duplicate "return" statement
        drm/nv04/crtc: Bail out if FB is not bound to crtc
        drm/nouveau: fix nv04_sgdma_bind on non-"4kB pages" archs
        drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate
        drm/nouveau: fix oops on pre-semaphore hardware
        drm/nv50/crtc: Bail out if FB is not bound to crtc
        drm/radeon/kms: fix DP detect and EDID fetch for DP bridges
      8cb3ed17
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc · 4c752782
      Linus Torvalds authored
      * 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
        ARM: CSR: add missing sentinels to of_device_id tables
        ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
        ARM: cns3xxx: Fix compile error caused by hardware.h removed
        ARM: davinci: fix cache flush build error
        ARM: davinci: correct MDSTAT_STATE_MASK
        ARM: davinci: da850 EVM: read mac address from SPI flash
        OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
        OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
        OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
        OMAP4: clock: fix compile warning
        OMAP4: clock: re-enable previous clockdomain enable/disable sequence
        OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
        OMAP: powerdomains: Make all powerdomain target states as ON at init
      4c752782
    • Mathieu Desnoyers's avatar
      ioctl: register LTTng ioctl · 14d01ff5
      Mathieu Desnoyers authored
      The LTTng 2.0 kernel tracer (stand-alone module package, available at
      http://lttng.org
      
      ) uses the 0xF6 ioctl range for tracer control and
      transport operations.
      Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      14d01ff5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://github.com/chrismason/linux · 0b001b2e
      Linus Torvalds authored
      * 'for-linus' of git://github.com/chrismason/linux:
        Btrfs: add dummy extent if dst offset excceeds file end in
        Btrfs: calc file extent num_bytes correctly in file clone
        btrfs: xattr: fix attribute removal
        Btrfs: fix wrong nbytes information of the inode
        Btrfs: fix the file extent gap when doing direct IO
        Btrfs: fix unclosed transaction handle in btrfs_cont_expand
        Btrfs: fix misuse of trans block rsv
        Btrfs: reset to appropriate block rsv after orphan operations
        Btrfs: skip locking if searching the commit root in csum lookup
        btrfs: fix warning in iput for bad-inode
        Btrfs: fix an oops when deleting snapshots
      0b001b2e
    • Miklos Szeredi's avatar
      fuse: fix memory leak · 5dfcc87f
      Miklos Szeredi authored
      
      
      kmemleak is reporting that 32 bytes are being leaked by FUSE:
      
        unreferenced object 0xe373b270 (size 32):
        comm "fusermount", pid 1207, jiffies 4294707026 (age 2675.187s)
        hex dump (first 32 bytes):
          01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00  ................
          00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
        backtrace:
          [<b05517d7>] kmemleak_alloc+0x27/0x50
          [<b0196435>] kmem_cache_alloc+0xc5/0x180
          [<b02455be>] fuse_alloc_forget+0x1e/0x20
          [<b0245670>] fuse_alloc_inode+0xb0/0xd0
          [<b01b1a8c>] alloc_inode+0x1c/0x80
          [<b01b290f>] iget5_locked+0x8f/0x1a0
          [<b0246022>] fuse_iget+0x72/0x1a0
          [<b02461da>] fuse_get_root_inode+0x8a/0x90
          [<b02465cf>] fuse_fill_super+0x3ef/0x590
          [<b019e56f>] mount_nodev+0x3f/0x90
          [<b0244e95>] fuse_mount+0x15/0x20
          [<b019d1bc>] mount_fs+0x1c/0xc0
          [<b01b5811>] vfs_kern_mount+0x41/0x90
          [<b01b5af9>] do_kern_mount+0x39/0xd0
          [<b01b7585>] do_mount+0x2e5/0x660
          [<b01b7966>] sys_mount+0x66/0xa0
      
      This leak report is consistent and happens once per boot on
      3.1.0-rc5-dirty.
      
      This happens if a FORGET request is queued after the fuse device was
      released.
      Reported-by: default avatarSitsofe Wheeler <sitsofe@yahoo.com>
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Tested-by: default avatarSitsofe Wheeler <sitsofe@yahoo.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5dfcc87f