Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.35-rc6-gi…
Commits on Jul 29, 2010
  1. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] etr: fix clock synchronization race
      [S390] Fix IRQ tracing in case of PER
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: update MAINTAINERS entry
  3. @torvalds

    Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/tiwai/sound-2.6
    
    * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Add a PC-beep workaround for ASUS P5-V
      ALSA: hda - Assume PC-beep as default for Realtek
      ALSA: hda - Don't register beep input device when no beep is available
      ALSA: hda - Fix pin-detection of Nvidia HDMI
  4. @torvalds

    CRED: Fix __task_cred()'s lockdep check and banner comment

    David Howells authored torvalds committed
    Fix __task_cred()'s lockdep check by removing the following validation
    condition:
    
    	lockdep_tasklist_lock_is_held()
    
    as commit_creds() does not take the tasklist_lock, and nor do most of the
    functions that call it, so this check is pointless and it can prevent
    detection of the RCU lock not being held if the tasklist_lock is held.
    
    Instead, add the following validation condition:
    
    	task->exit_state >= 0
    
    to permit the access if the target task is dead and therefore unable to change
    its own credentials.
    
    Fix __task_cred()'s comment to:
    
     (1) discard the bit that says that the caller must prevent the target task
         from being deleted.  That shouldn't need saying.
    
     (2) Add a comment indicating the result of __task_cred() should not be passed
         directly to get_cred(), but rather than get_task_cred() should be used
         instead.
    
    Also put a note into the documentation to enforce this point there too.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    CRED: Fix get_task_cred() and task_state() to not resurrect dead cred…

    David Howells authored torvalds committed
    …entials
    
    It's possible for get_task_cred() as it currently stands to 'corrupt' a set of
    credentials by incrementing their usage count after their replacement by the
    task being accessed.
    
    What happens is that get_task_cred() can race with commit_creds():
    
    	TASK_1			TASK_2			RCU_CLEANER
    	-->get_task_cred(TASK_2)
    	rcu_read_lock()
    	__cred = __task_cred(TASK_2)
    				-->commit_creds()
    				old_cred = TASK_2->real_cred
    				TASK_2->real_cred = ...
    				put_cred(old_cred)
    				  call_rcu(old_cred)
    		[__cred->usage == 0]
    	get_cred(__cred)
    		[__cred->usage == 1]
    	rcu_read_unlock()
    							-->put_cred_rcu()
    							[__cred->usage == 1]
    							panic()
    
    However, since a tasks credentials are generally not changed very often, we can
    reasonably make use of a loop involving reading the creds pointer and using
    atomic_inc_not_zero() to attempt to increment it if it hasn't already hit zero.
    
    If successful, we can safely return the credentials in the knowledge that, even
    if the task we're accessing has released them, they haven't gone to the RCU
    cleanup code.
    
    We then change task_state() in procfs to use get_task_cred() rather than
    calling get_cred() on the result of __task_cred(), as that suffers from the
    same problem.
    
    Without this change, a BUG_ON in __put_cred() or in put_cred_rcu() can be
    tripped when it is noticed that the usage count is not zero as it ought to be,
    for example:
    
    kernel BUG at kernel/cred.c:168!
    invalid opcode: 0000 [#1] SMP
    last sysfs file: /sys/kernel/mm/ksm/run
    CPU 0
    Pid: 2436, comm: master Not tainted 2.6.33.3-85.fc13.x86_64 #1 0HR330/OptiPlex
    745
    RIP: 0010:[<ffffffff81069881>]  [<ffffffff81069881>] __put_cred+0xc/0x45
    RSP: 0018:ffff88019e7e9eb8  EFLAGS: 00010202
    RAX: 0000000000000001 RBX: ffff880161514480 RCX: 00000000ffffffff
    RDX: 00000000ffffffff RSI: ffff880140c690c0 RDI: ffff880140c690c0
    RBP: ffff88019e7e9eb8 R08: 00000000000000d0 R09: 0000000000000000
    R10: 0000000000000001 R11: 0000000000000040 R12: ffff880140c690c0
    R13: ffff88019e77aea0 R14: 00007fff336b0a5c R15: 0000000000000001
    FS:  00007f12f50d97c0(0000) GS:ffff880007400000(0000) knlGS:0000000000000000
    CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    CR2: 00007f8f461bc000 CR3: 00000001b26ce000 CR4: 00000000000006f0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process master (pid: 2436, threadinfo ffff88019e7e8000, task ffff88019e77aea0)
    Stack:
     ffff88019e7e9ec8 ffffffff810698cd ffff88019e7e9ef8 ffffffff81069b45
    <0> ffff880161514180 ffff880161514480 ffff880161514180 0000000000000000
    <0> ffff88019e7e9f28 ffffffff8106aace 0000000000000001 0000000000000246
    Call Trace:
     [<ffffffff810698cd>] put_cred+0x13/0x15
     [<ffffffff81069b45>] commit_creds+0x16b/0x175
     [<ffffffff8106aace>] set_current_groups+0x47/0x4e
     [<ffffffff8106ac89>] sys_setgroups+0xf6/0x105
     [<ffffffff81009b02>] system_call_fastpath+0x16/0x1b
    Code: 48 8d 71 ff e8 7e 4e 15 00 85 c0 78 0b 8b 75 ec 48 89 df e8 ef 4a 15 00
    48 83 c4 18 5b c9 c3 55 8b 07 8b 07 48 89 e5 85 c0 74 04 <0f> 0b eb fe 65 48 8b
    04 25 00 cc 00 00 48 3b b8 58 04 00 00 75
    RIP  [<ffffffff81069881>] __put_cred+0xc/0x45
     RSP <ffff88019e7e9eb8>
    ---[ end trace df391256a100ebdd ]---
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Jiri Olsa <jolsa@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. watchdog: update MAINTAINERS entry

    Wim Van Sebroeck authored
    Add Mailing-list and website to watchdog MAINTAINERS entry.
    
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  7. @tiwai

    ALSA: hda - Add a PC-beep workaround for ASUS P5-V

    tiwai authored
    ASUS P5-V provides a SSID that unexpectedly matches with the value
    compilant with Realtek's specification.  Thus the driver interprets
    it badly, resulting in non-working PC beep.
    
    This patch adds a white-list for such a case; a white-list of known
    devices with working PC beep.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  8. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      x86,kgdb: Fix hw breakpoint regression
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds authored
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] ibmvscsi: Fix oops when an interrupt is pending during probe
      [SCSI] zfcp: Update status read mempool
      [SCSI] zfcp: Do not wait for SBALs on stopped queue
      [SCSI] zfcp: Fix check whether unchained ct_els is possible
      [SCSI] ipr: fix resource path display and formatting
  10. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      davinci: da850/omap-l138 evm: account for DEFDCDC{2,3} being tied high
      regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register
      wm8350-regulator: fix wm8350_register_regulator error handling
      ab3100: fix off-by-one value range checking for voltage selector
  11. @torvalds

    ecryptfs: Bugfix for error related to ecryptfs_hash_buckets

    Andre Osterhues authored torvalds committed
    The function ecryptfs_uid_hash wrongly assumes that the
    second parameter to hash_long() is the number of hash
    buckets instead of the number of hash bits.
    This patch fixes that and renames the variable
    ecryptfs_hash_buckets to ecryptfs_hash_bits to make it
    clearer.
    
    Fixes: CVE-2010-2492
    
    Signed-off-by: Andre Osterhues <aosterhues@escrypt.com>
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @jwessel

    x86,kgdb: Fix hw breakpoint regression

    jwessel authored
    HW breakpoints events stopped working correctly with kgdb
    as a result of commit: 018cbff
    (Merge commit 'v2.6.33' into perf/core).
    
    The regression occurred because the behavior changed for setting
    NOTIFY_STOP as the return value to the die notifier if the breakpoint
    was known to the HW breakpoint API.  Because kgdb is using the HW
    breakpoint API to register HW breakpoints slots, it must also now
    implement the overflow_handler call back else kgdb does not get to see
    the events from the die notifier.
    
    The kgdb_ll_trap function will be changed to be general purpose code
    which can allow an easy way to implement the hw_breakpoint API
    overflow call back.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Acked-by: Dongdong Deng <dongdong.deng@windriver.com>
    Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Commits on Jul 28, 2010
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: use complete_all and wake_up_all
      ceph: Correct obvious typo of Kconfig variable "CRYPTO_AES"
      ceph: fix dentry lease release
      ceph: fix leak of dentry in ceph_init_dentry() error path
      ceph: fix pg_mapping leak on pg_temp updates
      ceph: fix d_release dop for snapdir, snapped dentries
      ceph: avoid dcache readdir for snapdir
  2. @swhiteho @torvalds

    GFS2: Use kmalloc when possible for ->readdir()

    swhiteho authored torvalds committed
    If we don't need a huge amount of memory in ->readdir() then
    we can use kmalloc rather than vmalloc to allocate it. This
    should cut down on the greater overheads associated with
    vmalloc for smaller directories.
    
    We may be able to eliminate vmalloc entirely at some stage,
    but this is easy to do right away.
    
    Also using GFP_NOFS to avoid any issues wrt to deleting inodes
    while under a glock, and suggestion from Linus to factor out
    the alloc/dealloc.
    
    I've given this a test with a variety of different sized
    directories and it seems to work ok.
    
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: Prarit Bhargava <prarit@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @tiwai

    ALSA: hda - Assume PC-beep as default for Realtek

    tiwai authored
    Enable PC-beep as default for hardwares that aren't compliant with the
    SSID value Realtek requires.  In such a case, better to enable the beep
    to avoid a regression.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  4. @tiwai

    ALSA: hda - Don't register beep input device when no beep is available

    tiwai authored
    We check now the availability of PC beep and skip the build of beep
    mixers, but the driver still registers the input device.  This should
    be checked as well.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  5. davinci: da850/omap-l138 evm: account for DEFDCDC{2,3} being tied high

    Sekhar Nori authored Liam Girdwood committed
    Per the da850/omap-l138 Beta EVM SOM schematic, the DEFDCDC2 and
    DEFDCDC3 lines are tied high. This leads to a 3.3V IO and 1.2V CVDD
    voltage.
    
    Pass the right platform data to the TPS6507x driver so it can operate
    on the DEFDCDC{2,3}_HIGH register to read and change voltage levels.
    
    Signed-off-by: Sekhar Nori <nsekhar@ti.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  6. regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register

    Anuj Aggarwal authored Liam Girdwood committed
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    
    In TPS6507x, depending on the status of DEFDCDC{2,3} pin either
    DEFDCDC{2,3}_LOW or DEFDCDC{2,3}_HIGH register needs to be read or
    programmed to change the output voltage.
    
    The current driver assumes DEFDCDC{2,3} pins are always tied low
    and thus operates only on DEFDCDC{2,3}_LOW register. This need
    not always be the case (as is found on OMAP-L138 EVM).
    
    Unfortunately, software cannot read the status of DEFDCDC{2,3} pins.
    So, this information is passed through platform data depending on
    how the board is wired.
    
    Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
    Signed-off-by: Sekhar Nori <nsekhar@ti.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  7. @tiwai

    ALSA: hda - Fix pin-detection of Nvidia HDMI

    tiwai authored
    The behavior of Nvidia HDMI codec regarding the pin-detection unsol events
    is based on the old HD-audio spec, i.e. PD bit indicates only the update
    and doesn't show the current state.  Since the current code assumes the
    new behavior, the pin-detection doesn't work relialby with these h/w.
    
    This patch adds a flag for indicating the old spec, and fixes the issue
    by checking the pin-detection explicitly for such hardware.
    
    Tested-by: Wei Ni <wni@nvidia.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
Commits on Jul 27, 2010
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: Pass the correct end of buffer to p9stat_read
  2. @torvalds

    gpio: fix spurious printk when freeing a gpio

    Jon Povey authored torvalds committed
    When freeing a gpio that has not been exported, gpio_unexport() prints a
    debug message when it should just fall through silently.
    
    Example spurious message:
    
    	gpio_unexport: gpio0 status -22
    
    Signed-off-by: Jon Povey <jon.povey@racelogic.co.uk>
    Cc: David Brownell <david-b@pacbell.net>
    Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
    Cc: Gregory Bean <gbean@codeaurora.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    edac: mpc85xx: fix coldplug/hotplug module autoloading

    Anton Vorontsov authored torvalds committed
    The MPC85xx EDAC driver is missing module device aliases, so the driver
    won't load automatically on boot.  This patch fixes the issue by adding
    proper MODULE_DEVICE_TABLE() macros.
    
    Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
    Cc: Doug Thompson <dougthompson@xmission.com>
    Cc: Peter Tyser <ptyser@xes-inc.com>
    Cc: Dave Jiang <djiang@mvista.com>
    Cc: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    drivers/rtc/rtc-rx8581.c: fix setdatetime

    Rudolf Marek authored torvalds committed
    Fix the logic while writing new date/time to the chip.  The driver
    incorrectly wrote back register values to different registers and even
    with wrong mask.  The patch adds clearing of the VLF register, which
    should be cleared if all date/time values are set.
    
    Signed-off-by: Rudolf Marek <rudolf.marek@sysgo.com>
    Acked-by: Wan ZongShun <mcuos.com@gmail.com>
    Cc: Martyn Welch <martyn.welch@gefanuc.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @jibaron @torvalds

    dynamic debug: move ddebug_remove_module() down into free_module()

    jibaron authored torvalds committed
    The command
    
    	echo "file ec.c +p" >/sys/kernel/debug/dynamic_debug/control
    
    causes an oops.
    
    Move the call to ddebug_remove_module() down into free_module().  In this
    way it should be called from all error paths.  Currently, we are missing
    the remove if the module init routine fails.
    
    Signed-off-by: Jason Baron <jbaron@redhat.com>
    Reported-by: Thomas Renninger <trenn@suse.de>
    Tested-by: Thomas Renninger <trenn@suse.de>
    Cc: <stable@kernel.org>		[2.6.32+]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @yehudasa @liewegas

    ceph: use complete_all and wake_up_all

    yehudasa authored liewegas committed
    This fixes an issue triggered by running concurrent syncs. One of the syncs
    would go through while the other would just hang indefinitely. In any case, we
    never actually want to wake a single waiter, so the *_all functions should
    be used.
    
    Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
    Signed-off-by: Sage Weil <sage@newdream.net>
  7. @lionkov @ericvh

    9p: Pass the correct end of buffer to p9stat_read

    lionkov authored ericvh committed
    Pass the correct end of the buffer to p9stat_read.
    
    Signed-off-by: Latchesar Ionkov <lucho@ionkov.net>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  8. [S390] etr: fix clock synchronization race

    Martin Schwidefsky authored Martin Schwidefsky committed
    The etr events switch-to-local and sync-check disable the synchronous clock
    and schedule a work queue that tries to get the clock back into sync.
    If another switch-to-local or sync-check event occurs while the work queue
    function etr_work_fn still runs the eacr.es bit and the clock_sync_word can
    become inconsistent because check_sync_clock only uses the clock_sync_word
    to determine if the clock is in sync or not. The second pass of the
    etr_work_fn will reset the eacr.es bit but will leave the clock_sync_word
    intact. Fix this race by moving the reset of the eacr.es bit into the
    switch-to-local and sync-check functions and by checking the eacr.es bit
    as well to decide if the clock needs to be synced.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  9. [S390] Fix IRQ tracing in case of PER

    Heiko Carstens authored Martin Schwidefsky committed
    In case user space is single stepped (PER) the program check handler
    claims too early that IRQs are enabled on the return path.
    Subsequent checks will notice that the IRQ mask in the PSW and
    what lockdep thinks the IRQ mask should be do not correlate and
    therefore will print a warning to the console and disable lockdep.
    
    Fix this by doing all the work within the correct context.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  10. @antonblanchard

    [SCSI] ibmvscsi: Fix oops when an interrupt is pending during probe

    antonblanchard authored James Bottomley committed
    A driver needs to be ready to take an interrupt as soon as it registers
    an interrupt handler. I noticed the following oops when testing kdump:
    
    ipr: IBM Power RAID SCSI Device Driver version: 2.5.0 (February 11, 2010)
    ibmvscsi 30000002: SRP_VERSION: 16.a
    ibmvscsi 30000002: SRP_VERSION: 16.a
    Unable to handle kernel paging request for data at address 0x00000000
    ...
    pc: c000000004085e34: .tasklet_action+0xf4/0x1dc
    ...
    c000000004086fe4 .__do_softirq+0x16c/0x2c0
    c00000000403138c .call_do_softirq+0x14/0x24
    c00000000400ee14 .do_softirq+0xa0/0x104
    c00000000408690c .irq_exit+0x70/0xd0
    c00000000400f190 .do_IRQ+0x214/0x2a8
    c000000004004804 hardware_interrupt_entry+0x1c/0x98
    --- Exception: 501 (Hardware Interrupt) at c00000000400c544 .raw_local_irq_restore+0x48/0x54
    c00000000465d2a8 ._raw_spin_unlock_irqrestore+0x74/0xa0
    c0000000040e7f00 .__setup_irq+0x2ec/0x3f0
    c0000000040e8198 .request_threaded_irq+0x194/0x22c
    c00000000446d854 .rpavscsi_init_crq_queue+0x284/0x3f0
    c00000000446c764 .ibmvscsi_probe+0x688/0x710
    c00000000402903c .vio_bus_probe+0x37c/0x3e4
    c000000004403f10 .driver_probe_device+0xec/0x1b8
    c000000004404088 .__driver_attach+0xac/0xf4
    c000000004403184 .bus_for_each_dev+0x98/0x104
    c000000004403c98 .driver_attach+0x40/0x60
    c0000000044026f0 .bus_add_driver+0x154/0x324
    c0000000044045d0 .driver_register+0xe8/0x1ac
    c00000000402b2a8 .vio_register_driver+0x54/0x74
    c000000004933ea4 .ibmvscsi_module_init+0x80/0xc0
    c000000004009834 .do_one_initcall+0x98/0x1d8
    c0000000049005b4 .kernel_init+0x27c/0x33c
    c000000004031550 .kernel_thread+0x54/0x70
    
    srp_task needs to be setup before request_irq. The patch below fixes the oops.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Acked-by: Brian King <brking@linux.vnet.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  11. @torvalds

    Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/paulus/perf
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf:
      perf, powerpc: Use perf_sample_data_init() for the FSL code
  12. @torvalds

    Merge git://git.infradead.org/users/cbou/battery-2.6.35

    torvalds authored
    * git://git.infradead.org/users/cbou/battery-2.6.35:
      ds2782_battery: Rename get_current to fix build failure / name conflict
  13. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      s2io: fixing DBG_PRINT() macro
      ath9k: fix dma direction for map/unmap in ath_rx_tasklet
      net: dev_forward_skb should call nf_reset
      net sched: fix race in mirred device removal
      tun: avoid BUG, dump packet on GSO errors
      bonding: set device in RLB ARP packet handler
      wimax/i2400m: Add PID & VID for Intel WiMAX 6250
      ipv6: Don't add routes to ipv6 disabled interfaces.
      net: Fix skb_copy_expand() handling of ->csum_start
      net: Fix corruption of skb csum field in pskb_expand_head() of net/core/skbuff.c
      macvtap: Limit packet queue length
      ixgbe/igb: catch invalid VF settings
      bnx2x: Advance a module version
      bnx2x: Protect statistics ramrod and sequence number
      bnx2x: Protect a SM state change
      wireless: use netif_rx_ni in ieee80211_send_layer2_update
  14. @paulusmack

    perf, powerpc: Use perf_sample_data_init() for the FSL code

    Peter Zijlstra authored paulusmack committed
    We should use perf_sample_data_init() to initialize struct
    perf_sample_data.  As explained in the description of commit dc1d628
    ("perf: Provide generic perf_sample_data initialization"), it is
    possible for userspace to get the kernel to dereference data.raw,
    so if it is not initialized, that means that unprivileged userspace
    can possibly oops the kernel.  Using perf_sample_data_init makes sure
    it gets initialized to NULL.
    
    This conversion should have been included in commit dc1d628, but it
    got missed.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  15. @AxelLin

    wm8350-regulator: fix wm8350_register_regulator error handling

    AxelLin authored Liam Girdwood committed
    In the case of platform_device_add() fail, we should call
    platform_device_put() instead of platform_device_del()
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  16. @AxelLin

    ab3100: fix off-by-one value range checking for voltage selector

    AxelLin authored Liam Girdwood committed
    We use voltage selector as an array index for typ_voltages.
    Thus the valid range for voltage selector should be 0..voltages_len-1.
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Linus Walleij <linus.walleij@stericsson.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Something went wrong with that request. Please try again.