1. 04 Aug, 2010 5 commits
  2. 03 Aug, 2010 9 commits
    • Paul Mundt's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 · 701ec7a7
      Paul Mundt authored
      Conflicts:
      	arch/arm/configs/ap4evb_defconfig
      	arch/arm/configs/g3evm_defconfig
      	arch/arm/configs/g4evm_defconfig
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      701ec7a7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 3a09b1be
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Fix recovery stuck bug (try #2)
        GFS2: Fix typo in stuffed file data copy handling
        Revert "GFS2: recovery stuck on transaction lock"
        GFS2: Make "try" lock not try quite so hard
        GFS2: remove dependency on __GFP_NOFAIL
        GFS2: Simplify gfs2_write_alloc_required
        GFS2: Wait for journal id on mount if not specified on mount command line
        GFS2: Use nobh_writepage
      3a09b1be
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · 7046e668
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: do not warn unnecessarily
        UBI: do not print message about corruptes PEBs if we have none of them
        UBI: improve delete-compatible volumes handling
        UBI: fix error message and compilation warnings
        UBI: generate random image_seq when formatting MTD devices
        UBI: improve ECC error message
        UBI: improve corrupted flash handling
        UBI: introduce eraseblock counter variables
        UBI: introduce a new IO return code
        UBI: simplify IO error codes
      7046e668
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · c939f9f9
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: fix a memory leak on error path.
        UBIFS: fix GC LEB recovery
        UBIFS: use ERR_CAST
        UBIFS: check return code
      c939f9f9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · b8b3e905
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (22 commits)
        9p: fix sparse warnings in new xattr code
        fs/9p: remove sparse warning in vfs_inode
        fs/9p: destroy fid on failed remove
        fs/9p: Prevent parallel rename when doing fid_lookup
        fs/9p: Add support user. xattr
        net/9p: Implement TXATTRCREATE 9p call
        net/9p: Implement attrwalk 9p call
        9p: Implement LOPEN
        fs/9p: This patch implements TLCREATE for 9p2000.L protocol.
        9p: Implement TMKDIR
        9p: Implement TMKNOD
        9p: Define and implement TSYMLINK for 9P2000.L
        9p: Define and implement TLINK for 9P2000.L
        9p: Define and implement TLINK for 9P2000.L
        9p: Implement client side of setattr for 9P2000.L protocol.
        9p: getattr client implementation for 9P2000.L protocol.
        fs/9p: Pass the correct user credentials during attach
        net/9p: Handle the server returned error properly
        9p: readdir implementation for 9p2000.L
        9p: Make use of iounit for read/write
        ...
      b8b3e905
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 51102ee5
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (49 commits)
        xfs simplify and speed up direct I/O completions
        xfs: move aio completion after unwritten extent conversion
        direct-io: move aio_complete into ->end_io
        xfs: fix big endian build
        xfs: clean up xfs_bmap_get_bp
        xfs: simplify xfs_truncate_file
        xfs: kill the b_strat callback in xfs_buf
        xfs: remove obsolete osyncisosync mount option
        xfs: clean up filestreams helpers
        xfs: fix gcc 4.6 set but not read and unused statement warnings
        xfs: Fix build when CONFIG_XFS_POSIX_ACL=n
        xfs: fix unsigned underflow in xfs_free_eofblocks
        xfs: use GFP_NOFS for page cache allocation
        xfs: fix memory reclaim recursion deadlock on locked inode buffer
        xfs: fix xfs_trans_add_item() lockdep warnings
        xfs: simplify and remove xfs_ireclaim
        xfs: don't block on buffer read errors
        xfs: move inode shrinker unregister even earlier
        xfs: remove a dmapi leftover
        xfs: writepage always has buffers
        ...
      51102ee5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 54161df1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (29 commits)
        cifs: fsc should not default to "on"
        [CIFS] remove redundant path walking in dfs_do_refmount
        cifs: ignore the "mand", "nomand" and "_netdev" mount options
        cifs: map NT_STATUS_ERROR_WRITE_PROTECTED to -EROFS
        cifs: don't allow cifs_iget to match inodes of the wrong type
        [CIFS] relinquish fscache cookie before freeing CIFSTconInfo
        cifs: add separate cred_uid field to sesInfo
        fs: cifs: check kmalloc() result
        [CIFS] Missing ifdef
        [CIFS] Missing line from previous commit
        [CIFS] Fix build break when CONFIG_CIFS_FSCACHE disabled
        cifs: add mount option to enable local caching
        cifs: read pages from FS-Cache
        cifs: store pages into local cache
        cifs: FS-Cache page management
        cifs: define inode-level cache object and register them
        cifs: define superblock-level cache index objects and register them
        cifs: remove unused cifsUidInfo struct
        cifs: clean up cifs_find_smb_ses (try #2)
        cifs: match secType when searching for existing tcp session
        ...
      54161df1
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · be82ae02
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (291 commits)
        ARM: AMBA: Add pclk support to AMBA bus infrastructure
        ARM: 6278/2: fix regression in RealView after the introduction of pclk
        ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128
        ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY
        ARM: 6246/1: mmci: support larger MMCIDATALENGTH register
        ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants
        ARM: 6244/1: mmci: add variant data and default MCICLOCK support
        ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback
        ARM: 6274/1: add global control registers definition header file for nuc900
        mx2_camera: fix type of dma buffer virtual address pointer
        mx2_camera: Add soc_camera support for i.MX25/i.MX27
        arm/imx/gpio: add spinlock protection
        ARM: Add support for the LPC32XX arch
        ARM: LPC32XX: Arch config menu supoport and makefiles
        ARM: LPC32XX: Phytec 3250 platform support
        ARM: LPC32XX: Misc support functions
        ARM: LPC32XX: Serial support code
        ARM: LPC32XX: System suspend support
        ARM: LPC32XX: GPIO, timer, and IRQ drivers
        ARM: LPC32XX: Clock driver
        ...
      be82ae02
    • Helge Deller's avatar
      PARISC: led.c - fix potential stack overflow in led_proc_write() · 4b4fd27c
      Helge Deller authored
      avoid potential stack overflow by correctly checking count parameter
      Reported-by: default avatarIlja <ilja@netric.org>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Acked-by: default avatarKyle McMartin <kyle@mcmartin.ca>
      Cc: James E.J. Bottomley <jejb@parisc-linux.org>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4b4fd27c
  3. 02 Aug, 2010 26 commits