1. 21 Feb, 2011 13 commits
  2. 19 Feb, 2011 2 commits
  3. 11 Feb, 2011 7 commits
  4. 10 Feb, 2011 9 commits
  5. 08 Feb, 2011 1 commit
  6. 07 Feb, 2011 8 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 65d9055e
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        ALSA: AACI: allow writes to MAINCR to take effect
        ARM: Update mach-types
        ARM: 6652/1: ep93xx: correct the end address of the AC97 memory resource
        ARM: mxs/imx28: remove now unused clock lookup "fec.0"
        ARM: mxs: fix clock base address missing
        ARM: mxs: acknowledge gpio irq
        ARM: mach-imx/mach-mx25_3ds: Fix section type
        ARM: imx: Add VPR200 and MX51_3DS entries to uncompress.h
        ARM i.MX23: use correct register for setting the rate
        ARM i.MX23/28: remove secondary field from struct clk. It's unused
        ARM i.MX28: use correct register for setting the rate
        ARM i.MX28: fix bit operation
      65d9055e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · cb5520f0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (33 commits)
        Btrfs: Fix page count calculation
        btrfs: Drop __exit attribute on btrfs_exit_compress
        btrfs: cleanup error handling in btrfs_unlink_inode()
        Btrfs: exclude super blocks when we read in block groups
        Btrfs: make sure search_bitmap finds something in remove_from_bitmap
        btrfs: fix return value check of btrfs_start_transaction()
        btrfs: checking NULL or not in some functions
        Btrfs: avoid uninit variable warnings in ordered-data.c
        Btrfs: catch errors from btrfs_sync_log
        Btrfs: make shrink_delalloc a little friendlier
        Btrfs: handle no memory properly in prepare_pages
        Btrfs: do error checking in btrfs_del_csums
        Btrfs: use the global block reserve if we cannot reserve space
        Btrfs: do not release more reserved bytes to the global_block_rsv than we need
        Btrfs: fix check_path_shared so it returns the right value
        btrfs: check return value of btrfs_start_ioctl_transaction() properly
        btrfs: fix return value check of btrfs_join_transaction()
        fs/btrfs/inode.c: Add missing IS_ERR test
        btrfs: fix missing break in switch phrase
        btrfs: fix several uncheck memory allocations
        ...
      cb5520f0
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · eee4da2c
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Fix hcall tracepoint recursion
        powerpc/numa: Fix bug in unmap_cpu_from_node
        powerpc/numa: Disable VPHN on dedicated processor partitions
        powerpc/numa: Add length when creating OF properties via VPHN
        powerpc/numa: Check for all VPHN changes
        powerpc/numa: Only use active VPHN count fields
        powerpc/pseries: Remove unnecessary variable initializations in numa.c
        powerpc/pseries: Fix brace placement in numa.c
        powerpc/pseries: Fix typo in VPHN comments
        powerpc: Fix some 6xx/7xxx CPU setup functions
        powerpc: Pass the right cpu_spec to ->setup_cpu() on 64-bit
        powerpc/book3e: Protect complex macro args in mmu-book3e.h
        powerpc: Fix pfn_valid() when memory starts at a non-zero address
      eee4da2c
    • Linus Torvalds's avatar
      Merge branch 'omap-fixes-for-linus' of... · b8f049ae
      Linus Torvalds authored
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
        arm: omap4: panda: remove usb_nop_xceiv_register(v1)
        OMAP1: Fix non-working LCD on OMAP310
        OMAP3: Devkit8000: Change lcd power pin
        omap1: remove duplicated #include
        arm: mach-omap2: mux: free allocated memory on error exit
        arm: mach-omap2: board-rm680: fix rm680_vemmc regulator constraints
        OMAP: PM: SmartReflex: Fix possible null pointer read access
        OMAP: PM: SmartReflex: Fix possible memory leak
        arm: mach-omap2: voltage: debugfs: fix memory leak
        OMAP3: PM: fix save secure RAM to restore MPU power state
        OMAP: PM: SmartReflex: Add missing IS_ERR test
      b8f049ae
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · 06262a6b
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, nx: Mark the ACPI resume trampoline code as +x
      06262a6b
    • Tetsuo Handa's avatar
      CRED: Fix memory and refcount leaks upon security_prepare_creds() failure · fb2b2a1d
      Tetsuo Handa authored
      In prepare_kernel_cred() since 2.6.29, put_cred(new) is called without
      assigning new->usage when security_prepare_creds() returned an error.  As a
      result, memory for new and refcount for new->{user,group_info,tgcred} are
      leaked because put_cred(new) won't call __put_cred() unless old->usage == 1.
      
      Fix these leaks by assigning new->usage (and new->subscribers which was added
      in 2.6.32) before calling security_prepare_creds().
      Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fb2b2a1d
    • Tetsuo Handa's avatar
      CRED: Fix BUG() upon security_cred_alloc_blank() failure · 2edeaa34
      Tetsuo Handa authored
      In cred_alloc_blank() since 2.6.32, abort_creds(new) is called with
      new->security == NULL and new->magic == 0 when security_cred_alloc_blank()
      returns an error.  As a result, BUG() will be triggered if SELinux is enabled
      or CONFIG_DEBUG_CREDENTIALS=y.
      
      If CONFIG_DEBUG_CREDENTIALS=y, BUG() is called from __invalid_creds() because
      cred->magic == 0.  Failing that, BUG() is called from selinux_cred_free()
      because selinux_cred_free() is not expecting cred->security == NULL.  This does
      not affect smack_cred_free(), tomoyo_cred_free() or apparmor_cred_free().
      
      Fix these bugs by
      
      (1) Set new->magic before calling security_cred_alloc_blank().
      
      (2) Handle null cred->security in creds_are_invalid() and selinux_cred_free().
      Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2edeaa34
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 257a65d7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: remove checks for ses->status == CifsExiting
        cifs: add check for kmalloc in parse_dacl
        cifs: don't send an echo request unless NegProt has been done
        cifs: enable signing flag in SMB header when server has it on
        cifs: Possible slab memory corruption while updating extended stats (repost)
        CIFS: Fix variable types in cifs_iovec_read/write (try #2)
        cifs: fix length vs. total_read confusion in cifs_demultiplex_thread
      257a65d7