1. 28 5月, 2014 1 次提交
  2. 20 5月, 2014 1 次提交
    • G
      Merge tag 'extcon-next-for-3.16' of... · 6a57bad6
      Greg Kroah-Hartman 提交于
      Merge tag 'extcon-next-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
      
      Chanwoo writes:
      
      Update extcon for v3.16
      
      This patchset add resource-managed functions to automatically control the memory
      and unregistration operation of extcon. Also, This series support new MAX77836
      extcon device driver on existing MAX14577 device because existed a little
      difference between MAX77836 and MAX14577. Finally, Fix minor issue of extcon
      driver.
      
      Detailed description for patchset:
      1. Add resource-managed functions
      - Add resource-managed functions to automatically free the memory of extcon
      structure and to control unregistration behavior as following. This new devm_*
      functions applied all of extcon drivers in drivers/extcon/.
      : devm_extcon_dev_register/unregister()
      : devm_extcon_dev_allocate/free()
      : extcon_dev_allocate/free() for devm_extcon_dev_allocate/free()
      
      2. Add new MAX77836 extcon device
      - Support MAX77836 device on existing MAX14577 device driver using
      different compatible string. This patchset has dependency on MFD/
      Regulator/Extcon. So, Lee Jones(MFD Maintainer) created Immutable
      branch between MFD and Extcon due for v3.16 merge-window and then
      I merged this patchset from MFD git repo[1] to Extcon git repo.
      : [1] git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
        (branch: ib-mfd-extcon-3.16)
      
      3. Fix minor issue of extcon driver
      - extcon-palmas driver
      : Fix issue of extcon device name for probe
      - extcon-max14577
      : Fix probe failure about handling wrong return value.
      : Properly Handle return value of regmap_irq_get_virq function.
      - extcon-max8997/max77693 driver
      : Fix NULL pointer exception on missing pdata
      
      4. Code clean for extcon driver
      - extcon-max8997/max77693
      : Use power efficient workqueue for delayed cable detection
      6a57bad6
  3. 04 5月, 2014 25 次提交
  4. 29 4月, 2014 9 次提交
  5. 28 4月, 2014 4 次提交
    • L
      Linux 3.15-rc3 · d1db0eea
      Linus Torvalds 提交于
      d1db0eea
    • W
      word-at-a-time: avoid undefined behaviour in zero_bytemask macro · ec6931b2
      Will Deacon 提交于
      The asm-generic, big-endian version of zero_bytemask creates a mask of
      bytes preceding the first zero-byte by left shifting ~0ul based on the
      position of the first zero byte.
      
      Unfortunately, if the first (top) byte is zero, the output of
      prep_zero_mask has only the top bit set, resulting in undefined C
      behaviour as we shift left by an amount equal to the width of the type.
      As it happens, GCC doesn't manage to spot this through the call to fls(),
      but the issue remains if architectures choose to implement their shift
      instructions differently.
      
      An example would be arch/arm/ (AArch32), where LSL Rd, Rn, #32 results
      in Rd == 0x0, whilst on arch/arm64 (AArch64) LSL Xd, Xn, #64 results in
      Xd == Xn.
      
      Rather than check explicitly for the problematic shift, this patch adds
      an extra shift by 1, replacing fls with __fls. Since zero_bytemask is
      never called with a zero argument (has_zero() is used to check the data
      first), we don't need to worry about calling __fls(0), which is
      undefined.
      
      Cc: <stable@vger.kernel.org>
      Cc: Victor Kamensky <victor.kamensky@linaro.org>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ec6931b2
    • L
      Merge branch 'safe-dirty-tlb-flush' · ac6c9e2b
      Linus Torvalds 提交于
      This merges the patch to fix possible loss of dirty bit on munmap() or
      madvice(DONTNEED).  If there are concurrent writers on other CPU's that
      have the unmapped/unneeded page in their TLBs, their writes to the page
      could possibly get lost if a third CPU raced with the TLB flush and did
      a page_mkclean() before the page was fully written.
      
      Admittedly, if you unmap() or madvice(DONTNEED) an area _while_ another
      thread is still busy writing to it, you deserve all the lost writes you
      could get.  But we kernel people hold ourselves to higher quality
      standards than "crazy people deserve to lose", because, well, we've seen
      people do all kinds of crazy things.
      
      So let's get it right, just because we can, and we don't have to worry
      about it.
      
      * safe-dirty-tlb-flush:
        mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts
      ac6c9e2b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 33c0022f
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: limit the path size in send to PATH_MAX
        Btrfs: correctly set profile flags on seqlock retry
        Btrfs: use correct key when repeating search for extent item
        Btrfs: fix inode caching vs tree log
        Btrfs: fix possible memory leaks in open_ctree()
        Btrfs: avoid triggering bug_on() when we fail to start inode caching task
        Btrfs: move btrfs_{set,clear}_and_info() to ctree.h
        btrfs: replace error code from btrfs_drop_extents
        btrfs: Change the hole range to a more accurate value.
        btrfs: fix use-after-free in mount_subvol()
      33c0022f