1. 24 Dec, 2013 6 commits
  2. 01 Dec, 2013 3 commits
    • Pali Rohár's avatar
      power_supply: Add power_supply notifier · d36240d2
      Pali Rohár authored
      This patch adds a notifier chain to the power_supply, this helps drivers
      in other subsystem to listen to changes in power supply subsystem.
      
      This would help to take some actions in those drivers on changing the
      power supply properties. One such scenario is to increase/decrease system
      performance based on the battery capacity/voltage. Another scenario is to
      adjust the h/w peak current detection voltage/current thresholds based on
      battery voltage/capacity. The notifier helps drivers to listen to changes
      in power_suppy susbystem without polling the power_supply properties
      Signed-off-by: default avatarJenny TC <jenny.tc@intel.com>
      Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
      Acked-by: default avatarJenny TC <jenny.tc@intel.com>
      Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
      d36240d2
    • Austin Boyle's avatar
      max17042_battery: Fix build errors caused by missing REGMAP_I2C config · 93353e80
      Austin Boyle authored
      max17042 now uses regmap interface but does not enable config option. This
      patch fixes the following build errors:
      
      drivers/power/max17042_battery.c:661:15: error: variable ‘max17042_regmap_config’ has initializer but incomplete type
      drivers/power/max17042_battery.c:662:2: error: unknown field ‘reg_bits’ specified in initializer
      drivers/power/max17042_battery.c:662:2: warning: excess elements in struct initializer
      drivers/power/max17042_battery.c:662:2: warning: (near initialization for ‘max17042_regmap_config’)
      drivers/power/max17042_battery.c:663:2: error: unknown field ‘val_bits’ specified in initializer
      drivers/power/max17042_battery.c:663:2: warning: excess elements in struct initializer
      drivers/power/max17042_battery.c:663:2: warning: (near initialization for ‘max17042_regmap_config’)
      drivers/power/max17042_battery.c:664:2: error: unknown field ‘val_format_endian’ specified in initializer
      drivers/power/max17042_battery.c:664:23: error: ‘REGMAP_ENDIAN_NATIVE’ undeclared here (not in a function)
      drivers/power/max17042_battery.c:664:2: warning: excess elements in struct initializer
      drivers/power/max17042_battery.c:664:2: warning: (near initialization for ‘max17042_regmap_config’)
      drivers/power/max17042_battery.c: In function ‘max17042_probe’:
      drivers/power/max17042_battery.c:684:2: error: implicit declaration of function ‘devm_regmap_init_i2c’
      Signed-off-by: default avatarAustin Boyle <boyle.austin@gmail.com>
      Acked-by: default avatarJonghwa Lee <jonghwa3.lee@samsung.com>
      Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
      93353e80
    • Shuah Khan's avatar
      power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate · 80c6463e
      Shuah Khan authored
      power_supply_register() calls device_init_wakeup() to register a wakeup
      source before initializing dev_name. As a result, device_wakeup_enable()
      end up registering wakeup source with a null name when
      wakeup_source_register() gets called with dev_name(dev) which is null at
      the time.
      
      When kernel is booted with wakeup_source_activate enabled, it will panic
      when the trace point code tries to dereference ws->name.
      
      Fixed the problem by moving up the kobject_set_name() call prior to
      accesses to dev_name(). Replaced kobject_set_name() with dev_set_name()
      which is the right interface to be called from drivers. Fixed the call to
      device_del() prior to device_add() in for wakeup_init_failed error
      handling code.
      
      Trace after the change:
      
                  bash-2143  [003] d...   132.280697: wakeup_source_activate: BAT1 state=0x20001
           kworker/3:2-1169  [003] d...   132.281305: wakeup_source_deactivate: BAT1 state=0x30000
      
      Oops message:
      
      [  819.769934] device: 'BAT1': device_add
      [  819.770078] PM: Adding info for No Bus:BAT1
      [  819.770235] BUG: unable to handle kernel NULL pointer dereference at           (null)
      [  819.770435] IP: [<ffffffff813381c0>] skip_spaces+0x30/0x30
      [  819.770572] PGD 3efd90067 PUD 3eff61067 PMD 0
      [  819.770716] Oops: 0000 [#1] SMP
      [  819.770829] Modules linked in: arc4 iwldvm mac80211 x86_pkg_temp_thermal coretemp kvm_intel joydev i915 kvm uvcvideo ghash_clmulni_intel videobuf2_vmalloc aesni_intel videobuf2_memops videobuf2_core aes_x86_64 ablk_helper cryptd videodev iwlwifi lrw rfcomm gf128mul glue_helper bnep btusb media bluetooth parport_pc hid_generic ppdev snd_hda_codec_hdmi drm_kms_helper snd_hda_codec_realtek cfg80211 drm tpm_infineon samsung_laptop snd_hda_intel usbhid snd_hda_codec hid snd_hwdep snd_pcm microcode snd_page_alloc snd_timer psmouse i2c_algo_bit lpc_ich tpm_tis video wmi mac_hid serio_raw ext2 lp parport r8169 mii
      [  819.771802] CPU: 0 PID: 2167 Comm: bash Not tainted 3.12.0+ #25
      [  819.771876] Hardware name: SAMSUNG ELECTRONICS CO., LTD. 900X3C/900X3D/900X4C/900X4D/SAMSUNG_NP1234567890, BIOS P03AAC 07/12/2012
      [  819.772022] task: ffff88002e6ddcc0 ti: ffff8804015ca000 task.ti: ffff8804015ca000
      [  819.772119] RIP: 0010:[<ffffffff813381c0>]  [<ffffffff813381c0>] skip_spaces+0x30/0x30
      [  819.772242] RSP: 0018:ffff8804015cbc70  EFLAGS: 00010046
      [  819.772310] RAX: 0000000000000003 RBX: ffff88040cfd6d40 RCX: 0000000000000018
      [  819.772397] RDX: 0000000000020001 RSI: 0000000000000000 RDI: 0000000000000000
      [  819.772484] RBP: ffff8804015cbcc0 R08: 0000000000000000 R09: ffff8803f0768d40
      [  819.772570] R10: ffffea001033b800 R11: 0000000000000000 R12: ffffffff81c519c0
      [  819.772656] R13: 0000000000020001 R14: 0000000000000000 R15: 0000000000020001
      [  819.772744] FS:  00007ff98309b740(0000) GS:ffff88041f200000(0000) knlGS:0000000000000000
      [  819.772845] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [  819.772917] CR2: 0000000000000000 CR3: 00000003f59dc000 CR4: 00000000001407f0
      [  819.773001] Stack:
      [  819.773030]  ffffffff81114003 ffff8804015cbcb0 0000000000000000 0000000000000046
      [  819.773146]  ffff880409757a18 ffff8803f065a160 0000000000000000 0000000000020001
      [  819.773273]  0000000000000000 0000000000000000 ffff8804015cbce8 ffffffff8143e388
      [  819.773387] Call Trace:
      [  819.773434]  [<ffffffff81114003>] ? ftrace_raw_event_wakeup_source+0x43/0xe0
      [  819.773520]  [<ffffffff8143e388>] wakeup_source_report_event+0xb8/0xd0
      [  819.773595]  [<ffffffff8143e3cd>] __pm_stay_awake+0x2d/0x50
      [  819.773724]  [<ffffffff8153395c>] power_supply_changed+0x3c/0x90
      [  819.773795]  [<ffffffff8153407c>] power_supply_register+0x18c/0x250
      [  819.773869]  [<ffffffff813d8d18>] sysfs_add_battery+0x61/0x7b
      [  819.773935]  [<ffffffff813d8d69>] battery_notify+0x37/0x3f
      [  819.774001]  [<ffffffff816ccb7c>] notifier_call_chain+0x4c/0x70
      [  819.774071]  [<ffffffff81073ded>] __blocking_notifier_call_chain+0x4d/0x70
      [  819.774149]  [<ffffffff81073e26>] blocking_notifier_call_chain+0x16/0x20
      [  819.774227]  [<ffffffff8109397a>] pm_notifier_call_chain+0x1a/0x40
      [  819.774316]  [<ffffffff81095b66>] hibernate+0x66/0x1c0
      [  819.774407]  [<ffffffff81093931>] state_store+0x71/0xa0
      [  819.774507]  [<ffffffff81331d8f>] kobj_attr_store+0xf/0x20
      [  819.774613]  [<ffffffff811f8618>] sysfs_write_file+0x128/0x1c0
      [  819.774735]  [<ffffffff8118579d>] vfs_write+0xbd/0x1e0
      [  819.774841]  [<ffffffff811861d9>] SyS_write+0x49/0xa0
      [  819.774939]  [<ffffffff816d1052>] system_call_fastpath+0x16/0x1b
      [  819.775055] Code: 89 f8 48 89 e5 f6 82 c0 a6 84 81 20 74 15 0f 1f 44 00 00 48 83 c0 01 0f b6 10 f6 82 c0 a6 84 81 20 75 f0 5d c3 66 0f 1f 44 00 00 <80> 3f 00 55 48 89 e5 74 15 48 89 f8 0f 1f 40 00 48 83 c0 01 80
      [  819.775760] RIP  [<ffffffff813381c0>] skip_spaces+0x30/0x30
      [  819.775881]  RSP <ffff8804015cbc70>
      [  819.775949] CR2: 0000000000000000
      [  819.794175] ---[ end trace c4ef25127039952e ]---
      Signed-off-by: default avatarShuah Khan <shuah.kh@samsung.com>
      Acked-by: default avatarAnton Vorontsov <anton@enomsg.org>
      Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
      80c6463e
  3. 29 Nov, 2013 13 commits
    • Linus Torvalds's avatar
      Linux 3.13-rc2 · dc1ccc48
      Linus Torvalds authored
      dc1ccc48
    • Linus Torvalds's avatar
      Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · d5ff835f
      Linus Torvalds authored
      Pull ARM64 fixes from Catalin Marinas:
       - Remove preempt_count modifications in the arm64 IRQ handling code
         since that's already dealt with in generic irq_enter/irq_exit
       - PTE_PROT_NONE bit moved higher up to avoid overlapping with the
         hardware bits (for PROT_NONE mappings which are pte_present)
       - Big-endian fixes for ptrace support
       - Asynchronous aborts unmasking while in the kernel
       - pgprot_writecombine() change to create Normal NonCacheable memory
         rather than Device GRE
      
      * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: Move PTE_PROT_NONE higher up
        arm64: Use Normal NonCacheable memory for writecombine
        arm64: debug: make aarch32 bkpt checking endian clean
        arm64: ptrace: fix compat registes get/set to be endian clean
        arm64: Unmask asynchronous aborts when in kernel mode
        arm64: dts: Reserve the memory used for secondary CPU release address
        arm64: let the core code deal with preempt_count
      d5ff835f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 033dbbde
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "One performance improvement and a few bug fixes.  Two of the fixes
        deal with the clock related problems we have seen on recent kernels"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/mm: handle asce-type exceptions as normal page fault
        s390,time: revert direct ktime path for s390 clockevent device
        s390/time,vdso: convert to the new update_vsyscall interface
        s390/uaccess: add missing page table walk range check
        s390/mm: optimize copy_page
        s390/dasd: validate request size before building CCW/TCW request
        s390/signal: always restore saved runtime instrumentation psw bit
      033dbbde
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · dc418f6e
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Some easy but needed fixes for i2c drivers since rc1"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: bcm2835: Linking platform nodes to adapter nodes
        i2c: omap: raw read and write endian fix
        i2c: i2c-bcm-kona: Fix module build
        i2c: i2c-diolan-u2c: different usb endpoints for DLN-2-U2C
        i2c: bcm-kona: remove duplicated include
        i2c: davinci: raw read and write endian fix
      dc418f6e
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 7224b31b
      Linus Torvalds authored
      Pull workqueue fixes from Tejun Heo:
       "This contains one important fix.  The NUMA support added a while back
        broke ordering guarantees on ordered workqueues.  It was enforced by
        having single frontend interface with @max_active == 1 but the NUMA
        support puts multiple interfaces on unbound workqueues on NUMA
        machines thus breaking the ordered guarantee.  This is fixed by
        disabling NUMA support on ordered workqueues.
      
        The above and a couple other patches were sitting in for-3.12-fixes
        but I forgot to push that out, so they ended up waiting a bit too
        long.  My aplogies.
      
        Other fixes are minor"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues
        workqueue: fix comment typo for __queue_work()
        workqueue: fix ordered workqueues in NUMA setups
        workqueue: swap set_cpus_allowed_ptr() and PF_NO_SETAFFINITY
      7224b31b
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · de92a058
      Linus Torvalds authored
      Pull libata fixes from Tejun Heo:
       "libata device removal path was removing parent device node before its
        child, which is mostly harmless but triggers warning after recent
        sysfs changes.  Rafael's patch fixes the order.
      
        Other than that, minor controller-specific fixes and device ID
        additions"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ATA: Fix port removal ordering
        ahci: add Marvell 9230 to the AHCI PCI device list
        ata: fix acpi_bus_get_device() return value check
        pata_arasan_cf: add missing clk_disable_unprepare() on error path
        ahci: add support for IBM Akebono platform device
      de92a058
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 2855987d
      Linus Torvalds authored
      Pull cgroup fixes from Tejun Heo:
       "Fixes for three issues.
      
         - cgroup destruction path could swamp system_wq possibly leading to
           deadlock.  This actually seems to happen in the wild with memcg
           because memcg destruction path adds nested dependency on system_wq.
      
           Resolved by isolating cgroup destruction work items on its
           dedicated workqueue.
      
         - Possible locking context deadlock through seqcount reported by
           lockdep
      
         - Memory leak under certain conditions"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: fix cgroup_subsys_state leak for seq_files
        cpuset: Fix memory allocator deadlock
        cgroup: use a dedicated workqueue for cgroup destruction
      2855987d
    • Linus Torvalds's avatar
      Merge tag 'sound-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b8495995
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Quite a few HD-Audio fixes, a WUSB audio fix and a fix for FireWire
        audio.  The HD-audio part contains a couple of fixes for the generic
        parser, and these are the only intrusive fixes.  The rest are mostly
        device-specific fixes"
      
      * tag 'sound-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Add LFE chmap to ASUS ET2700
        ALSA: hda - Initialize missing bass speaker pin for ASUS AIO ET2700
        ALSA: hda - limit mic boost on Asus UX31[A,E]
        ALSA: hda - Check leaf nodes to find aamix amps
        ALSA: hda - Fix hp-mic mode without VREF bits
        ALSA: hda - Create Headhpone Mic Jack Mode when really needed
        ALSA: usb: use multiple packets per urb for Wireless USB inbound audio
        ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Conexant codec
        ALSA: hda - Drop bus->avoid_link_reset flag
        ALSA: hda/realtek - Set pcbeep amp for ALC668
        ALSA: hda/realtek - Add support of ALC231 codec
        ALSA: firewire-lib: fix wrong value for FDF field as an empty packet
      b8495995
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · b01537bf
      Linus Torvalds authored
      Pull vfs dentry reference count fix from Al Viro.
      
      This fixes a possible inode_permission NULL pointer dereference (and
      other problems) that were due to the root dentry count being decremented
      too much.  In commit 48a066e7 ("RCU'd vfsmounts") the placement of
      clearing the LOOKUP_RCU bit changed, and we then returned failure of
      incrementing the lockref on the parent dentry with LOOKUP_RCU cleared.
      
      But that meant we needed to go through the same cleanup routines that
      the later failures did wrt LOOKUP_ROOT and nd->root.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fix bogus path_put() of nd->root after some unlazy_walk() failures
      b01537bf
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 282c183b
      Linus Torvalds authored
      Pull drm qxl leak fix from Dave Airlie:
       "As usual 5 mins after I send a trivial pull fix I find a real bug!
      
        This fixes a memory leak and I'd like to get it into stable queue
        asap"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/qxl: fix memory leak in release list handling
      282c183b
    • Catalin Marinas's avatar
      arm64: Move PTE_PROT_NONE higher up · 3676f9ef
      Catalin Marinas authored
      PTE_PROT_NONE means that a pte is present but does not have any
      read/write attributes. However, setting the memory type like
      pgprot_writecombine() is allowed and such bits overlap with
      PTE_PROT_NONE. This causes mmap/munmap issues in drivers that change the
      vma->vm_pg_prot on PROT_NONE mappings.
      
      This patch reverts the PTE_FILE/PTE_PROT_NONE shift in commit
      59911ca4 (ARM64: mm: Move PTE_PROT_NONE bit) and moves PTE_PROT_NONE
      together with the other software bits.
      Signed-off-by: default avatarSteve Capper <steve.capper@linaro.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Tested-by: default avatarSteve Capper <steve.capper@linaro.org>
      Cc: <stable@vger.kernel.org> # 3.11+
      3676f9ef
    • Catalin Marinas's avatar
      arm64: Use Normal NonCacheable memory for writecombine · 4f00130b
      Catalin Marinas authored
      This provides better performance compared to Device GRE and also allows
      unaligned accesses. Such memory is intended to be used with standard RAM
      (e.g. framebuffers) and not I/O.
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      4f00130b
    • Al Viro's avatar
      fix bogus path_put() of nd->root after some unlazy_walk() failures · d870b4a1
      Al Viro authored
      Failure to grab reference to parent dentry should go through the
      same cleanup as nd->seq mismatch.  As it is, we might end up with
      caller thinking it needs to path_put() nd->root, with obvious
      nasty results once we'd hit that bug enough times to drive the
      refcount of root dentry all the way to zero...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      d870b4a1
  4. 28 Nov, 2013 18 commits
    • Dave Airlie's avatar
      drm/qxl: fix memory leak in release list handling · 1b28c3e6
      Dave Airlie authored
      wow no idea how I got this far without seeing this,
      leaking the entries in the list makes kmalloc-64 slab grow.
      
      References: https://bugzilla.kernel.org/show_bug.cgi?id=65121
      Cc: stable@vger.kernel.org
      Reported-by: default avatarMatthew Stapleton <matthew4196@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      1b28c3e6
    • Matthew Leach's avatar
      arm64: debug: make aarch32 bkpt checking endian clean · 2dacab73
      Matthew Leach authored
      The current breakpoint instruction checking code for A32 is not endian
      clean. Fix this with appropriate byte-swapping when retrieving
      instructions.
      Signed-off-by: default avatarMatthew Leach <matthew.leach@arm.com>
      Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      2dacab73
    • Matthew Leach's avatar
      arm64: ptrace: fix compat registes get/set to be endian clean · 6a2e5e52
      Matthew Leach authored
      On a BE system the wrong half of the X registers is retrieved/written
      when attempting to get/set the value of aarch32 registers through
      ptrace.
      
      Ensure that types are the correct width so that the relevant
      casting occurs.
      Signed-off-by: default avatarMatthew Leach <matthew.leach@arm.com>
      Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      6a2e5e52
    • Linus Torvalds's avatar
      Merge tag 'gpio-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · dda9cc3a
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "Here us a bunch of patches for the v3.13 series.  Most important stuff
        is related to fixes and documentation for the new GPIO descriptor API.
        If the diffstat is scary you'll notice most of it is to
        Documentation/*:
      
         - A big slew of documentation for the gpiod transition that happened
           in the merge window, no semantic effect, but we should provide
           proper documentation with the new API.
      
         - Fix flags related to the new API.
      
         - Fix to the find_chip_by_name() lookup function related to the new
           API.
      
         - Fix of_find_gpio() when not using device tree.
      
         - Bug fix for the TB10x direction setting.
      
         - Error path fixes from Dan Carpenter.
      
         - Nasty IRQdomain bug relating to taking an unitialized spinlock.
      
         - Minor fixes here and there"
      
      * tag 'gpio-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: bcm281xx: Fix return value of bcm_kona_gpio_get()
        gpio: pl061: move irqdomain initialization
        gpio: ucb1400: Add MODULE_ALIAS
        gpiolib: fix of_find_gpio() when OF not defined
        gpio: fix memory leak in error path
        gpio: rcar: NULL dereference on error in probe()
        gpio: msm: make msm_gpio.summary_irq signed for error handling
        gpio: mvebu: make mvchip->irqbase signed for error handling
        gpiolib: use dedicated flags for GPIO properties
        gpiolib: fix find_chip_by_name()
        Documentation: gpiolib: document new interface
        gpio: tb10x: Set output value before setting direction to output
      dda9cc3a
    • Linus Torvalds's avatar
      Merge tag 'md/3.13-fixes' of git://neil.brown.name/md · 962ba263
      Linus Torvalds authored
      Pull md fixes from Neil Brown:
       "Three bug fixes for md in 3.13-rc
      
        All recent regressions, one in 3.12 so marked for -stable"
      
      * tag 'md/3.13-fixes' of git://neil.brown.name/md:
        md/raid5: fix newly-broken locking in get_active_stripe.
        md: test mddev->flags more safely in md_check_recovery.
        md/raid5: fix new memory-reference bug in alloc_thread_groups.
      962ba263
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 3bad8bb5
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "SMB3 "validate negotiate" is needed to prevent certain types of
        downgrade attacks.
      
        Also changes SMB2/SMB3 copy offload from using the BTRFS copy ioctl
        (BTRFS_IOC_CLONE) to a cifs specific ioctl (CIFS_IOC_COPYCHUNK_FILE)
        to address Christoph's comment that there are semantic differences
        between requesting copy offload in which copy-on-write is mandatory
        (as in the BTRFS ioctl) and optional in the SMB2/SMB3 case.  Also
        fixes SMB2/SMB3 copychunk for large files"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        [CIFS] Do not use btrfs refcopy ioctl for SMB2 copy offload
        Check SMB3 dialects against downgrade attacks
        Removed duplicated (and unneeded) goto
        CIFS: Fix SMB2/SMB3 Copy offload support (refcopy) for large files
      3bad8bb5
    • Helge Deller's avatar
      kernel/extable: fix address-checks for core_kernel and init areas · 5ecbe3c3
      Helge Deller authored
      The init_kernel_text() and core_kernel_text() functions should not
      include the labels _einittext and _etext when checking if an address is
      inside the .text or .init sections.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5ecbe3c3
    • Takashi Iwai's avatar
      ALSA: hda - Add LFE chmap to ASUS ET2700 · eb9ca3ab
      Takashi Iwai authored
      As the previous commit 1f0bbf03 added the pin config for the bass
      speaker, this patch adds the corresponding LFE-only channel map on
      ASUS ET2700.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65961Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      eb9ca3ab
    • Takashi Iwai's avatar
      ALSA: hda - Initialize missing bass speaker pin for ASUS AIO ET2700 · 1f0bbf03
      Takashi Iwai authored
      Add a fixup entry for the missing bass speaker pin 0x16 on ASUS ET2700
      AiO desktop.  The channel map will be added in the next patch, so that
      this can be backported easily to stable kernels.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65961
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      1f0bbf03
    • Oleksij Rempel's avatar
      ALSA: hda - limit mic boost on Asus UX31[A,E] · 2cede303
      Oleksij Rempel authored
      This both devices need limit for internal dmic.
      
      [cosmetic change; renamed fixup name by tiwai]
      Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      2cede303
    • Takashi Iwai's avatar
      ALSA: hda - Check leaf nodes to find aamix amps · 2ded3e5b
      Takashi Iwai authored
      The current generic parser assumes blindly that the volume and mute
      amps are found in the aamix node itself.  But on some codecs,
      typically Analog Devices ones, the aamix amps are separately
      implemented in each leaf node of the aamix node, and the current
      driver can't establish the correct amp controls.  This is a regression
      compared with the previous static quirks.
      
      This patch extends the search for the amps to the leaf nodes for
      allowing the aamix controls again on such codecs.
      In this implementation, I didn't code to loop through the whole paths,
      since usually one depth should suffice, and we can't search too
      deeply, as it may result in the conflicting control assignments.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65641
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      2ded3e5b
    • Florian Meier's avatar
      i2c: bcm2835: Linking platform nodes to adapter nodes · 07a27a00
      Florian Meier authored
      In order to find I2C devices in the device tree, the platform nodes
      have to be known by the I2C core. This requires setting the
      dev.of_node parameter of the adapter.
      Signed-off-by: default avatarFlorian Meier <florian.meier@koalo.de>
      Tested-by: default avatarStephen Warren <swarren@wwwdotorg.org>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      07a27a00
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · e7c0d3da
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Just two minor fixes as people keep resending since they are so low
        hanging"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau/hwmon: fix compilation without CONFIG_HWMON
        drm/sysfs: fix OOM verification
      e7c0d3da
    • Linus Torvalds's avatar
      Merge tag 'tty-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 682a2512
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are some tty/serial driver fixes for reported issues in 3.13-rc2.
      
        The n_gsm "fix" was reverted as it was found to not be correct.
        Hopefully this will be resolved in a future pull request, but as
        there's really only one user of this line setting, it's not a big
        deal..."
      
      * tag 'tty-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "n_gsm: race between ld close and gsmtty open"
        n_tty: Protect minimum_to_wake reset for concurrent readers
        tty: Reset hupped state on open
        TTY: amiserial, add missing platform check
        TTY: pmac_zilog, check existence of ports in pmz_console_init()
        n_gsm: race between ld close and gsmtty open
        tty/serial/8250: fix typo in help text
        n_tty: Fix 4096-byte canonical reads
        n_tty: Fix echo overrun tail computation
        n_tty: Ensure reader restarts worker for next reader
      682a2512
    • Linus Torvalds's avatar
      Merge tag 'staging-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 0b0f7f1c
      Linus Torvalds authored
      Pull staging fixes from Greg KH:
       "Here are a number of staging, and IIO driver, fixes for 3.13-rc2 that
        resolve issues that have been reported for 3.13-rc1.  All of these
        have been in linux-next for a bit this week"
      
      * tag 'staging-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (25 commits)
        Staging: tidspbridge: disable driver
        staging: zsmalloc: Ensure handle is never 0 on success
        staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic
        staging: r8188eu: Fix AP mode
        Staging: btmtk_usb: Add hdev parameter to hdev->send driver callback
        Staging: go7007: fix up some remaining go->dev issues
        staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
        staging: ft1000: fix use of potentially uninitialized variable
        Revert "staging:media: Use dev_dbg() instead of pr_debug()"
        Staging: zram: Fix memory leak by refcount mismatch
        staging: vt6656: [BUG] Fix for TX USB resets from vendors driver.
        staging: nvec: potential NULL dereference on error path
        Staging: vt6655-6: potential NULL dereference in hostap_disable_hostapd()
        staging: comedi: s626: fix value written by s626_set_dac()
        Staging: comedi: pcl730: fix some bitwise vs logical AND bugs
        staging: comedi: fix potentially uninitialised variable
        iio:accel:kxsd9 fix missing mutex unlock
        iio: adc: ti_am335x_adc: avoid double free of buffer.
        staging:iio: Fix hmc5843 Kconfig dependencies
        iio: Fix tcs3472 Kconfig dependencies
        ...
      0b0f7f1c
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.13-rc2' of... · f4968636
      Linus Torvalds authored
      Merge tag 'driver-core-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fixes from Greg KH:
       "Here are 3 patches for sysfs issues that have been reported.  Well, 1
        patch really, the first one is reverted as it's not really needed (the
        correct fix is coming in through the different driver subsystems
        instead)
      
        But that 1 sysfs fix is needed, so this is still a good thing to pull
        in now"
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      
      * tag 'driver-core-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()"
        sysfs: use a separate locking class for open files depending on mmap
        sysfs: handle duplicate removal attempts in sysfs_remove_group()
      f4968636
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · ba33fef0
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
       - fix compat ioctl leak in uhid, by David Herrmann
       - fix scheduling in atomic context (causing actual lockups in real
         world) in hid-sony driver, by Sven Eckelmann
       - revert patch introducing VID/PID conflict, by Jiri Kosina
       - support from various new device IDs by Benjamin Tissoires and
         KaiChung Cheng
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: uhid: fix leak for 64/32 UHID_CREATE
        HID: kye: fix unresponsive keyboard
        HID: kye: Add report fixup for Genius Manticore Keyboard
        HID: multicouh: add PID VID to support 1 new Wistron optical touch device
        HID: appleir: force input to be set
        Revert "HID: wiimote: add LEGO-wiimote VID"
        HID: sony: Send FF commands in non-atomic context
      ba33fef0
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · b7fe6bf7
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - Fix for a recent regression in the Tegra cpufreq driver causing
         excess error messages to be printed from Stephen Warren
      
       - ACPI-based device hotplug fix to prevent conflicting notify handlers
         from being installed for PCI host bridge objects.  From Toshi Kani
      
       - ACPICA update to upstream version 20131115.  This contains bug fixes
         mostly (loop termination fix for the get AML length function, fixes
         related to namespace node removal and debug output).  From Bob Moore,
         Tomasz Nowicki and Lv Zheng
      
       - Removal of incorrect inclusions of internal ACPICA header files by
         non-ACPICA code from Lv Zheng
      
       - Fixes for the ACPI sysfs interface exposing tables to user space from
         Daisuke Hatayama and Jeremy Compostella
      
       - Assorted ACPI and cpufreq cleanups from Sachin Kamat and Al Stone
      
       - cpupower tool fix and man page from Thomas Renninger
      
      * tag 'pm+acpi-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: Clean up incorrect inclusions of ACPICA headers
        tools: cpupower: fix wrong err msg not supported vs not available
        tools: cpupower: Add cpupower-idle-set(1) manpage
        ACPI / sysfs: Fix incorrect ACPI tables walk in acpi_tables_sysfs_init()
        ACPI / sysfs: Set file size for each exposed ACPI table
        ACPICA: Update version to 20131115.
        ACPICA: Add support to delete all objects attached to the root namespace node.
        ACPICA: Delete all attached data objects during namespace node deletion.
        ACPICA: Resources: Fix loop termination for the get AML length function.
        ACPICA: Tests: Add CHECKSUM_ABORT protection for test utilities.
        ACPICA: Debug output: Do not emit function nesting level for kernel build.
        ACPI / sleep: clean up compiler warning about uninitialized field
        cpufreq: exynos: Remove unwanted EXPORT_SYMBOL
        cpufreq: tegra: don't error target() when suspended
        ACPI / hotplug: Fix conflicted PCI bridge notify handlers
      b7fe6bf7