1. 07 Mar, 2010 32 commits
  2. 06 Mar, 2010 8 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs · 66b89159
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
        [LogFS] Change magic number
        [LogFS] Remove h_version field
        [LogFS] Check feature flags
        [LogFS] Only write journal if dirty
        [LogFS] Fix bdev erases
        [LogFS] Silence gcc
        [LogFS] Prevent 64bit divisions in hash_index
        [LogFS] Plug memory leak on error paths
        [LogFS] Add MAINTAINERS entry
        [LogFS] add new flash file system
      
      Fixed up trivial conflict in lib/Kconfig, and a semantic conflict in
      fs/logfs/inode.c introduced by write_inode() being changed to use
      writeback_control' by commit a9185b41
      ("pass writeback_control to ->write_inode")
      66b89159
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · 87c7ae06
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
        dm raid1: fix deadlock when suspending failed device
        dm: eliminate some holes data structures
        dm ioctl: introduce flag indicating uevent was generated
        dm: free dm_io before bio_endio not after
        dm table: remove unused dm_get_device range parameters
        dm ioctl: only issue uevent on resume if state changed
        dm raid1: always return error if all legs fail
        dm mpath: refactor pg_init
        dm mpath: wait for pg_init completion when suspending
        dm mpath: hold io until all pg_inits completed
        dm mpath: avoid storing private suspended state
        dm: document when snapshot has finished merging
        dm table: remove dm_get from dm_table_get_md
        dm mpath: skip activate_path for failed paths
        dm mpath: pass struct pgpath to pg init done
      87c7ae06
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · dff6d1c5
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (23 commits)
        hwmon: Remove the deprecated adt7473 driver
        hwmon: Fix off-by-one kind values
        hwmon: (tmp421) Fix temperature conversions
        hwmon: (tmp421) Restore missing inputs
        hwmon: Driver for Andigilog aSC7621 family monitoring chips
        hwmon: (adt7411) Improve locking
        hwmon: Add driver for ADT7411 voltage and temperature sensor
        hwmon: (w83793) Add watchdog functionality
        hwmon: (g760a) Make rpm_from_cnt static
        hwmon: (it87) Validate auto pwm settings
        hwmon: (it87) Add support for old automatic fan speed control
        hwmon: (it87) Drop dead web links in documentation
        hwmon: (it87) Add an entry in MAINTAINERS
        hwmon: (it87) Use strict_strtol instead of simple_strtol
        hwmon: (it87) Fix many checkpatch errors and warnings
        hwmon: (it87) Add support for beep on alarm
        hwmon: (it87) Create vid attributes by group
        hwmon: (it87) Refactor attributes creation and removal
        hwmon: (it87) Expose the PWM/temperature mappings
        hwmon: (it87) Display fan outputs in automatic mode as such
        ...
      dff6d1c5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 66ce3cf8
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (21 commits)
        xfs: return inode fork offset in bulkstat for fsr
        xfs: Increase the default size of the reserved blocks pool
        xfs: truncate delalloc extents when IO fails in writeback
        xfs: check for more work before sleeping in xfssyncd
        xfs: Fix a build warning in xfs_aops.c
        xfs: fix locking for inode cache radix tree tag updates
        xfs: remove xfs_ipin/xfs_iunpin
        xfs: cleanup xfs_iunpin_wait/xfs_iunpin_nowait
        xfs: kill xfs_lrw.h
        xfs: factor common xfs_trans_bjoin code
        xfs: stop passing opaque handles to xfs_log.c routines
        xfs: split xfs_bmap_btalloc
        xfs: fix xfs_fsblock_t tracing
        xfs: fix inode pincount check in fsync
        xfs: Non-blocking inode locking in IO completion
        xfs: implement optimized fdatasync
        xfs: remove wrapper for the fsync file operation
        xfs: remove wrappers for read/write file operations
        xfs: merge xfs_lrw.c into xfs_file.c
        xfs: fix dquota trace format
        ...
      66ce3cf8
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux · 05c5cb31
      Linus Torvalds authored
      * 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: (22 commits)
        nfsd4: fix minor memory leak
        svcrpc: treat uid's as unsigned
        nfsd: ensure sockets are closed on error
        Revert "sunrpc: move the close processing after do recvfrom method"
        Revert "sunrpc: fix peername failed on closed listener"
        sunrpc: remove unnecessary svc_xprt_put
        NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN
        xfs_export_operations.commit_metadata
        commit_metadata export operation replacing nfsd_sync_dir
        lockd: don't clear sm_monitored on nsm_reboot_lookup
        lockd: release reference to nsm_handle in nlm_host_rebooted
        nfsd: Use vfs_fsync_range() in nfsd_commit
        NFSD: Create PF_INET6 listener in write_ports
        SUNRPC: NFS kernel APIs shouldn't return ENOENT for "transport not found"
        SUNRPC: Bury "#ifdef IPV6" in svc_create_xprt()
        NFSD: Support AF_INET6 in svc_addsock() function
        SUNRPC: Use rpc_pton() in ip_map_parse()
        nfsd: 4.1 has an rfc number
        nfsd41: Create the recovery entry for the NFSv4.1 client
        nfsd: use vfs_fsync for non-directories
        ...
      05c5cb31
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/ubi-2.6 · 4582a30c
      Linus Torvalds authored
      * git://git.infradead.org/ubi-2.6:
        UBI: add write checking
        UBI: simplify debugging return codes
        UBI: fix attaching error path
        UBI: support attaching by MTD character device name
        UBI: mark few variables as __initdata
      4582a30c
    • Denis Turischev's avatar
      gpio: introduce it8761e_gpio driver for IT8761E Super I/O chip · 9cc0cb3c
      Denis Turischev authored
      Signed-off-by: default avatarDenis Turischev <denis@compulab.co.il>
      Cc: David Brownell <david-b@pacbell.net>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9cc0cb3c
    • Ben Gardner's avatar
      gpio: cs5535-gpio: fix input direction · a8a5164c
      Ben Gardner authored
      The cs5535-gpio driver's get() function was returning the output value.
      This means that the GPIO pins would never work as an input, even if
      configured as an input.
      
      The driver should return the READ_BACK value, which is the sensed line
      value.  To make that work when the direction is 'output', INPUT_ENABLE
      needs to be set.
      
      In addition, the driver was not disabling OUTPUT_ENABLE when the direction
      is set to 'input'.  That would cause the GPIO to continue to drive the pin
      if the direction was ever set to output.
      
      This issue was noticed when attempting to use the gpiolib driver to read
      an external input.  I had previously been using the char/cs5535-gpio
      driver.
      Signed-off-by: default avatarBen Gardner <gardner.ben@gmail.com>
      Acked-by: default avatarAndres Salomon <dilinger@collabora.co.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: David Brownell <dbrownell@users.sourceforge.net>
      Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: <stable@kernel.org>		[2.6.33.x]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a8a5164c