28 Mar, 2011

9 commits

  • New Asus notebooks are using a WMI device similar to
    the one used in Eee PCs. Since we don't want to load
    eeepc-wmi module on Asus notebooks, and we want to
    keep the eeepc-wmi module for backward compatibility,
    this patch introduce a new module, named asus-wmi, that
    will be used by eeepc-wmi and the new Asus Notebook WMI
    Driver.

    eeepc-wmi's input device strings (device name and phys)
    are kept, but rfkill and led names are changed (s/eeepc/asus/).
    This should not break anything since rfkill are used by type or
    index, not by name, and the eeepc::touchpad led wasn't working
    correctly before 2.6.39 anyway.

    Signed-off-by: Corentin Chary
    Signed-off-by: Matthew Garrett

    Corentin Chary
     
  • Signed-off-by: Mattia Dongili
    Signed-off-by: Matthew Garrett

    Mattia Dongili
     
  • Signed-off-by: Corentin Chary
    Signed-off-by: Matthew Garrett

    Corentin Chary
     
  • Signed-off-by: Corentin Chary
    Signed-off-by: Matthew Garrett

    Corentin Chary
     
  • * 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block: (122 commits)
    cciss: fix lost command issue
    drbd: need include for bitops functions declarations
    Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"
    cciss: fix missed command status value CMD_UNABORTABLE
    cciss: remove unnecessary casts
    cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent
    cciss: Inform controller we are using 32-bit tags.
    cciss: hoist tag masking out of loop
    cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation
    cciss: export resettable host attribute
    drbd: drop code present under #ifdef which is relevant to 2.6.28 and below
    drbd: Fixed handling of read errors on a 'VerifyS' node
    drbd: Fixed handling of read errors on a 'VerifyT' node
    drbd: Implemented real timeout checking for request processing time
    drbd: Remove unused function atodb_endio()
    drbd: improve log message if received sector offset exceeds local capacity
    drbd: kill dead code
    drbd: don't BUG_ON, if bio_add_page of a single page to an empty bio fails
    drbd: Removed left over, now wrong comments
    drbd: serialize admin requests for new verify run with pending bitmap io
    ...

    Linus Torvalds
     
  • * 'docs-next' of git://git.lwn.net/linux-2.6:
    docs: update the development process document
    docs: fix dev_debug() braino in dynamic-debug-howto.txt

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (f71882fg) Add support for the F71889A
    hwmon: (f71882fg) Add support for the F81865F
    hwmon: (f71882fg) Document all supported devices
    hwmon: (f71882fg) Per-chip fan/temperature input count tables
    hwmon: (f71882fg) Secure chip property definition arrays

    Linus Torvalds
     
  • Fix fsl_rio.c kernel-doc warning: no exported symbols as
    requested by !E are found:

    Warning(arch/powerpc/sysdev/fsl_rio.c): no structured comments found

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • DocBook/v4l/ no longer has any *.png files, so the 'cp' command fails,
    breaking the build. Drop the *.png cp.

    cp: cannot stat `linux-2.6.38-git18/Documentation/DocBook/v4l/*.png': No such file or directory

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

26 Mar, 2011

9 commits

  • Signed-off-by: Hans de Goede
    Acked-by: Guenter Roeck
    Signed-off-by: Jean Delvare

    Hans de Goede
     
  • Add support for the Fintek F81865F. It's essentially compatible with
    the F71882FG, but has fewer inputs: 7 voltage, 2 temperature and 2 fan
    inputs only.

    Signed-off-by: Jean Delvare
    Acked-by: Hans de Goede
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • The list of supported devices was not always well documented in all
    places. Clarify and list all devices in documentation, Kconfig and
    the driver itself.

    Signed-off-by: Jean Delvare
    Acked-by: Hans de Goede
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (55 commits)
    [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
    [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion
    [SCSI] Revert "[SCSI] Retrieve the Caching mode page"
    [SCSI] bnx2fc: IO completion not processed due to missed wakeup
    [SCSI] qla4xxx: Update driver version to 5.02.00-k6
    [SCSI] qla4xxx: masking required bits of add_fw_options during initialization
    [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices
    [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param
    [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter
    [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed
    [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter
    [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
    [SCSI] qla4xxx: cleanup DDB relogin logic during initialization
    [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
    [SCSI] qla4xxx: Do not send mbox command if FW is in failed state
    [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
    [SCSI] ses: add subenclosure support
    [SCSI] bnx2fc: Bump version to 1.0.1
    [SCSI] bnx2fc: Remove unnecessary module state checks
    [SCSI] bnx2fc: Fix MTU issue by using static MTU
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
    dm stripe: implement merge method
    dm mpath: allow table load with no priority groups
    dm mpath: fail message ioctl if specified path is not valid
    dm ioctl: add flag to wipe buffers for secure data
    dm ioctl: prepare for crypt key wiping
    dm crypt: wipe keys string immediately after key is set
    dm: add flakey target
    dm: fix opening log and cow devices for read only tables

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched, doc: Update sched-design-CFS.txt
    sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group()
    sched.h: Fix a typo ("its")
    sched: Fix yield_to kernel-doc

    Linus Torvalds
     
  • Here's a set of changes updating Documentation/development-process. I have
    update kernel releases and relevant statistics, added information for a
    couple of tools, zapped some trailing white space, and generally tried to
    make it more closely match the current state of affairs.

    [Typo fixes from Joe Perches and Nicolas Kaiser incorporated]

    Signed-off-by: Jonathan Corbet
    Acked-by: Greg KH
    Cc: Randy Dunlap

    Jonathan Corbet
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits)
    ext4: fix a BUG in mb_mark_used during trim.
    ext4: unused variables cleanup in fs/ext4/extents.c
    ext4: remove redundant set_buffer_mapped() in ext4_da_get_block_prep()
    ext4: add more tracepoints and use dev_t in the trace buffer
    ext4: don't kfree uninitialized s_group_info members
    ext4: add missing space in printk's in __ext4_grp_locked_error()
    ext4: add FITRIM to compat_ioctl.
    ext4: handle errors in ext4_clear_blocks()
    ext4: unify the ext4_handle_release_buffer() api
    ext4: handle errors in ext4_rename
    jbd2: add COW fields to struct jbd2_journal_handle
    jbd2: add the b_cow_tid field to journal_head struct
    ext4: Initialize fsync transaction ids in ext4_new_inode()
    ext4: Use single thread to perform DIO unwritten convertion
    ext4: optimize ext4_bio_write_page() when no extent conversion is needed
    ext4: skip orphan cleanup if fs has unknown ROCOMPAT features
    ext4: use the nblocks arg to ext4_truncate_restart_trans()
    ext4: fix missing iput of root inode for some mount error paths
    ext4: make FIEMAP and delayed allocation play well together
    ext4: suppress verbose debugging information if malloc-debug is off
    ...

    Fi up conflicts in fs/ext4/super.c due to workqueue changes

    Linus Torvalds
     
  • While looking at dynamic-debug-howto.txt, I noticed that it references
    dev_debug() (which doesn't exist) instead of dev_dbg() (which does
    exist). I'm lazy, so I choose to fix the document rather than changing
    every dev_dbg() call.

    Signed-off-by: Jonathan Corbet

    Jonathan Corbet
     

25 Mar, 2011

4 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
    fs: simplify iget & friends
    fs: pull inode->i_lock up out of writeback_single_inode
    fs: rename inode_lock to inode_hash_lock
    fs: move i_wb_list out from under inode_lock
    fs: move i_sb_list out from under inode_lock
    fs: remove inode_lock from iput_final and prune_icache
    fs: Lock the inode LRU list separately
    fs: factor inode disposal
    fs: protect inode->i_state with inode->i_lock
    autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
    autofs4 - remove autofs4_lock
    autofs4 - fix d_manage() return on rcu-walk
    autofs4 - fix autofs4_expire_indirect() traversal
    autofs4 - fix dentry leak in autofs4_expire_direct()
    autofs4 - reinstate last used update on access
    vfs - check non-mountpoint dentry might block in __follow_mount_rcu()

    Linus Torvalds
     
  • Now that inode state changes are protected by the inode->i_lock and
    the inode LRU manipulations by the inode_lru_lock, we can remove the
    inode_lock from prune_icache and the initial part of iput_final().

    instead of using the inode_lock to protect the inode during
    iput_final, use the inode->i_lock instead. This protects the inode
    against new references being taken while we change the inode state
    to I_FREEING, as well as preventing prune_icache from grabbing the
    inode while we are manipulating it. Hence we no longer need the
    inode_lock in iput_final prior to setting I_FREEING on the inode.

    For prune_icache, we no longer need the inode_lock to protect the
    LRU list, and the inodes themselves are protected against freeing
    races by the inode->i_lock. Hence we can lift the inode_lock from
    prune_icache as well.

    Signed-off-by: Dave Chinner
    Signed-off-by: Al Viro

    Dave Chinner
     
  • * 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
    Documentation/iostats.txt: bit-size reference etc.
    cfq-iosched: removing unnecessary think time checking
    cfq-iosched: Don't clear queue stats when preempt.
    blk-throttle: Reset group slice when limits are changed
    blk-cgroup: Only give unaccounted_time under debug
    cfq-iosched: Don't set active queue in preempt
    block: fix non-atomic access to genhd inflight structures
    block: attempt to merge with existing requests on plug flush
    block: NULL dereference on error path in __blkdev_get()
    cfq-iosched: Don't update group weights when on service tree
    fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
    block: Require subsystems to explicitly allocate bio_set integrity mempool
    jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
    jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
    fs: make fsync_buffers_list() plug
    mm: make generic_writepages() use plugging
    blk-cgroup: Add unaccounted time to timeslice_used.
    block: fixup plugging stubs for !CONFIG_BLOCK
    block: remove obsolete comments for blkdev_issue_zeroout.
    blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
    ...

    Fix up conflicts in fs/{aio.c,super.c}

    Linus Torvalds
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
    [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
    [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
    [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
    [media] v4l: soc-camera: Store negotiated buffer settings
    [media] rc: interim support for 32-bit NEC-ish scancodes
    [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
    [media] lirc_zilog: error out if buffer read bytes != chunk size
    [media] lirc: silence some compile warnings
    [media] hdpvr: use same polling interval as other OS
    [media] ir-kbd-i2c: pass device code w/key in hauppauge case
    [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
    [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
    [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
    [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
    [media] rc-rc5-hauppauge-new: Add support for the old Black RC
    [media] rc-rc5-hauppauge-new: Add the old control to the table
    [media] rc-winfast: Fix the keycode tables
    [media] a800: Fix a few wrong IR key assignments
    [media] opera1: Use multimedia keys instead of an app-specific mapping
    [media] dw2102: Use multimedia keys instead of an app-specific mapping
    ...

    Fix up trivial conflicts (remove/modify and some real conflicts) in:
    arch/arm/mach-omap2/devices.c
    drivers/staging/Kconfig
    drivers/staging/Makefile
    drivers/staging/dabusb/dabusb.c
    drivers/staging/dabusb/dabusb.h
    drivers/staging/easycap/easycap_ioctl.c
    drivers/staging/usbvideo/usbvideo.c
    drivers/staging/usbvideo/vicam.c

    Linus Torvalds
     

24 Mar, 2011

10 commits

  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (42 commits)
    ACPI: minor printk format change in acpi_pad
    ACPI: make acpi_pad /sys output more readable
    ACPICA: Update version to 20110316
    ACPICA: Header support for SLIC table
    ACPI: Make sure the FADT is at least rev 2 before using the reset register
    ACPI: Bug compatibility for Windows on the ACPI reboot vector
    ACPICA: Fix access width for reset vector
    ACPI battery: fribble sysfs files from a resume notifier
    ACPI button: remove unused procfs I/F
    ACPI, APEI, Add PCIe AER error information printing support
    PCIe, AER, use pre-generated prefix in error information printing
    ACPI, APEI, Add ERST record ID cache
    ACPI: Use syscore_ops instead of sysdev class and sysdev
    ACPI: Remove the unused EC sysdev class
    ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree
    ACPI: use __init where possible in processor driver
    Thermal_Framework-Fix_crash_during_hwmon_unregister
    ACPICA: Update version to 20110211.
    ACPICA: Add mechanism to defer _REG methods for some installed handlers
    ACPICA: Add support for FunctionalFixedHW in acpi_ut_get_region_name
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
    Squashfs: Use vmalloc rather than kmalloc for zlib workspace
    Squashfs: handle corruption of directory structure
    Squashfs: wrap squashfs_mount() definition
    Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore
    Squashfs: Update documentation to include compression options
    Squashfs: Update Kconfig help text to include xz compression
    Squashfs: add compression options support to xz decompressor
    Squashfs: extend decompressor framework to handle compression options

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (90 commits)
    mfd: Push byte swaps out of wm8994 bulk read path
    mfd: Rename ab8500 gpadc header
    mfd: Constify WM8994 write path
    mfd: Push byte swap out of WM8994 bulk I/O
    mfd: Avoid copying data in WM8994 I2C write
    mfd: Remove copy from WM831x I2C write function
    mfd: Staticise WM8994 PM ops
    regulator: Add a subdriver for TI TPS6105x regulator portions v2
    mfd: Add a core driver for TI TPS61050/TPS61052 chips v2
    gpio: Add Tunnel Creek support to sch_gpio
    mfd: Add Tunnel Creek support to lpc_sch
    pci_ids: Add Intel Tunnel Creek LPC Bridge device ID.
    regulator: MAX8997/8966 support
    mfd: Add WM8994 bulk register write operation
    mfd: Append additional read write on 88pm860x
    mfd: Adopt mfd_data in 88pm860x input driver
    mfd: Adopt mfd_data in 88pm860x regulator
    mfd: Adopt mfd_data in 88pm860x led
    mfd: Adopt mfd_data in 88pm860x backlight
    mfd: Fix MAX8997 Kconfig entry typos
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.open-osd.org/linux-open-osd:
    exofs: deprecate the commands pending counter
    exofs: Write sbi->s_nextid as part of the Create command
    exofs: Add option to mount by osdname
    exofs: Override read-ahead to align on stripe_size
    exofs: simple fsync race fix
    exofs: Optimize read_4_write
    exofs: Trivial: fix some indentation and debug prints
    exofs: Remove redundant unlikely()

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (140 commits)
    MAINTAINERS: de-orphan fbdev.
    MAINTAINERS: Add file pattern for fb dt bindings.
    video: Move sm501fb devicetree binding documentation to a better place.
    fbcon: fix situation where fbcon gets deinitialised and can't reinit.
    video, sm501: add OF binding to support SM501
    video, sm501: add edid and commandline support
    video, sm501: add I/O functions for use on powerpc
    video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET
    fbcon: Bugfix soft cursor detection in Tile Blitting
    video: add missing framebuffer_release in error path
    video: metronomefb: add __devexit_p around reference to metronomefb_remove
    video: hecubafb: add __devexit_p around reference to hecubafb_remove
    drivers:video:aty:radeon_base Fix typo occationally to occasionally
    atmel_lcdfb: add fb_blank function
    atmel_lcdfb: implement inverted contrast pwm
    video: s3c-fb: return proper error if clk_get fails
    uvesafb,vesafb: create WC or WB PAT-entries
    video: ffb: fix ffb_probe error path
    radeonfb: Let hwmon driver probe the "monid" I2C bus
    fbdev: sh_mobile_lcdc: checking NULL instead of IS_ERR()
    ...

    Linus Torvalds
     
  • This target is the same as the linear target except that it returns I/O
    errors periodically. It's been found useful in simulating failing
    devices for testing purposes.

    I needed a dm target to do some failure testing on btrfs's raid code, and
    Mike pointed me at this.

    Signed-off-by: Josef Bacik
    Signed-off-by: Alasdair G Kergon

    Josef Bacik
     
  • Add RapidIO documentation files as it was discussed earlier (see thread
    http://marc.info/?l=linux-kernel&m=129202338918062&w=2)

    Signed-off-by: Alexandre Bounine
    Cc: Kumar Gala
    Cc: Matt Porter
    Cc: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexandre Bounine
     
  • - correction that disk stats values are native-word-sized
    32-bit or 64-bit values, not always 32-bi values
    - drop "Last modified" entry; use git for that
    - fix a few typos
    - change "cpu" to "CPU"

    Reported-by: Linda Walsh
    Signed-off-by: Randy Dunlap
    Signed-off-by: Jens Axboe

    Randy Dunlap
     
  • This patch adds the missing core_tpg_del_initiator_node_acl() call required
    by fabric modules for struct se_node_acl->acl_group context shutdown via

    target_core_fabric_configfs.c:target_fabric_nacl_base_release() ->

    struct target_core_fabric_ops->fabric_drop_nodeacl()

    for tcm_mod_builder.py generated $FABRIC_MOD_configfs.c skeleton code.

    Signed-off-by: Fubo Chen
    Signed-off-by: Nicholas A. Bellinger
    Signed-off-by: James Bottomley

    Fubo Chen
     
  • This patch converts the tcm_mod_builder.py generation script to
    create a new drivers/target/$TCM_FABRIC_MOD/Makefile and update
    drivers/target/Makefile, instead of creating+updating a 'Kbuild'
    filename.

    It also removes the remaining EXTRA_CFLAGS includes from
    tcm_mod_build_kbuild(), and converts fabric module generated .c
    code to us ""-style includes for $FABRIC_MOD_[base,fabric].h

    Reported-by: Christoph Hellwig
    Signed-off-by: Nicholas A. Bellinger
    Signed-off-by: James Bottomley

    Nicholas Bellinger
     

23 Mar, 2011

8 commits

  • Correct ->dequeue_tree() thinko into sched_class->dequeue_task
    and drop all references to ->task_new() since it is obviously
    gone.

    Signed-off-by: Borislav Petkov
    Cc: Peter Zijlstra
    Cc: Mike Galbraith
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Borislav Petkov
     
  • This driver exposes the sysfs nodes of the TWL4030 MADC module.
    All the voltage channel values are expressed in terms of mV. Channel 13
    and channel 14 are reserved. There are channels which represent
    temperature and current the output is represented by celcius
    and mA respectively.

    Signed-off-by: Keerthy
    Acked-by: Guenter Roeck
    Signed-off-by: Samuel Ortiz

    Keerthy
     
  • Conflicts:
    arch/x86/kernel/acpi/sleep.c

    Signed-off-by: Len Brown

    Len Brown
     
  • Len Brown
     
  • Len Brown
     
  • Remove unused ACPI button procfs interface.
    Only /proc/acpi/button/lid/LID/state remains.

    Signed-off-by: Zhang Rui
    Signed-off-by: Len Brown

    Zhang Rui
     
  • ADFS (FileCore) storage complies with the RISC OS filetype specification
    (12 bits of file type information is stored in the file load address,
    rather than using a file extension). The existing driver largely ignores
    this information and does not present it to the end user.

    It is desirable that stored filetypes be made visible to the end user to
    facilitate a precise copy of data and metadata from a hard disc (or image
    thereof) into a RISC OS emulator (such as RPCEmu) or to a network share
    which can be accessed by real Acorn systems.

    This patch implements a per-mount filetype suffix option (use -o
    ftsuffix=1) to present any filetype as a ,xyz hexadecimal suffix on each
    file. This type suffix is compatible with that used by RISC OS systems
    that access network servers using NFS client software and by RPCemu's host
    filing system.

    Signed-off-by: Stuart Swales
    Cc: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stuart Swales
     
  • page-types.c doesn't supply a way to specify the debugfs path and the
    original debugfs path is not usual on most machines. This patch supplies
    a way to auto mount debugfs if needed.

    This patch is heavily inspired by tools/perf/utils/debugfs.c

    [akpm@linux-foundation.org: make functions static]
    [akpm@linux-foundation.org: fix debugfs_mount() signature]
    Signed-off-by: Chen Gong
    Reviewed-by: KOSAKI Motohiro
    Reviewed-by: Wu Fengguang
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Chen Gong