Permalink
Commits on Jun 6, 2015
  1. msm: HTC: Enable f2fs support for m4

    mdmower committed Apr 4, 2015
    Change-Id: I62f805a3a7b8901696ba9d654fc851cb74f4c2c7
Commits on May 13, 2015
  1. msm: camera: Reduce log spam

    intervigilium committed May 12, 2015
    * Excessive log spam leads to watchdog reset
    
    Change-Id: I8ac25f9c4b1708305819d528540e292c5751faa4
Commits on May 9, 2015
  1. msm: HTC: m7: Disable continuous splash for Renesas panel

    intervigilium committed May 9, 2015
    Change-Id: I03843d16b674185001e48b59b19c22cd6ff0912a
Commits on May 8, 2015
  1. msm: HTC: zara: enable zram, zsmalloc, lz4 and f2fs

    PatrikKT authored and Gerrit Code Review committed May 8, 2015
    Change-Id: I59fcfdbcbeb276441d04812ccfe6801614459783
Commits on May 6, 2015
  1. msm: HTC: m7: Fix Sharp Renesas panel init

    mdmower committed May 6, 2015
    The panel on commands from PANEL_ID_DLXJ_SHARP_RENESAS were errantly
    being used for PANEL_ID_M7_SHARP_RENESAS due to a bad if/else block.
    
    Change-Id: I8b4cfc1f0a0bc96accb31018f69cd8372bc95851
Commits on May 3, 2015
  1. ipv4: Missing sk_nulls_node_init() in ping_unhash().

    davem330 authored and intervigilium committed May 2, 2015
    If we don't do that, then the poison value is left in the ->pprev
    backlink.
    
    This can cause crashes if we do a disconnect, followed by a connect().
    
    Change-Id: I021261c6639339a0d027ee5cb086ba7301db334a
    Tested-by: Linus Torvalds <torvalds@linux-foundation.org>
    Reported-by: Wen Xu <hotdog3645@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    (cherry picked from commit f1c984d)
Commits on Apr 28, 2015
  1. cpufreq: interactive: fix compiling warnings

    cwhuang authored and invisiblek committed Dec 24, 2013
    The gcc warns like:
    
      cpufreq_interactive.c:745:6: warning: operation on 'ret' may be
    undefined [-Wsequence-point]
    
    It was introduced by commit cf0fad49d17cb8273ce555dd5b7afab67d7923bf.
    
    Since sprintf(...) just return 1 (one character) in this case, ret
    should not changed.
    Just discarding the result of sprintf(...) leads to the result that
    the committer of cf0fad49d17cb8273ce555dd5b7afab67d7923bf wants.
    
    Change-Id: Ifed1cef6d6a31c3ed23dad03a567b3b9eddf3a57
    Signed-off-by: Chih-Wei Huang <cwhuang@android-x86.org>
Commits on Apr 23, 2015
  1. Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.17' into cm-12.1

    Flyhalf205 authored and mdmower committed Apr 22, 2015
    Change-Id: I6d3bc1916bbc7872c2acbf93549334f70269a5db
Commits on Apr 22, 2015
  1. net: llc: use correct size for sysctl timeout entries

    sashalevin authored and mdmower committed Jan 24, 2015
    The timeout entries are sizeof(int) rather than sizeof(long), which
    means that when they were getting read we'd also leak kernel memory
    to userspace along with the timeout values.
    
    Change-Id: I328d1186720a6f70f555eeeb62c83ee69814868d
    Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. gpu: msm2: Sync to upstream

    Flyhalf205 authored and Gerrit Code Review committed Apr 21, 2015
    * Sync to android-msm-flo-3.4-lollipop-mr1
    
    Change-Id: Icf692aea7e0a38d8b8e23d4ede968a2fd463f7bd
Commits on Apr 21, 2015
  1. staging: prima: Merge LA.AF.1.1_rb1.17

    Flyhalf205 committed Apr 21, 2015
    wlan: Decrement pending mgmt packet count if defer msg fails.
    wlan: Decrement pending mgmt packet count properly.
    wlan: Fix wlan mgmt pkt drop issue.
    wlan: Drop mgmt frames if they exceed 1/4 of total VOS pkts in peMcMq.
    wlan: configure correct STAID to enable TL caching
    wlan: reset FTState to eFT_START_READY whenever STA disconnect.
    wlan: In UAPSD state, allow apps to power collapse.
    
    Change-Id: Idce3a5154a62694e96d08f5df605ed8338a04599
Commits on Apr 20, 2015
  1. Merge AU_LINUX_ANDROID_LA.AF.1.1_RB1.05.01.00.006.025 on remote branch

    Linux Build Service Account
    Linux Build Service Account committed Apr 20, 2015
    Change-Id: Ib7e22ef203dd40ff6e2c284134dd533fee29406c
Commits on Apr 19, 2015
  1. msm: HTC: zara: board file ifdef mixup

    brinlyau authored and Gerrit Code Review committed Apr 19, 2015
    Apparently we get compile errors on some Ubuntu hosts. 
    
    Change-Id: I91956fb4ffb52ef55134c87134549a5580991166
  2. msm: HTC : zara: Add ZARA_CL defconfig

    brinlyau committed Apr 19, 2015
    It's exactly the same as normal zara except has NFC enabled.
    
    Change-Id: Ic7e02db41ab1c67da3ebf3701b68ec35f8d4152c
Commits on Apr 17, 2015
  1. msm: HTC: t6: Enable zram/zsmalloc/lz4

    Flyhalf205 authored and Gerrit Code Review committed Apr 17, 2015
    Change-Id: I1186d9fec28279f943957ca5129416bedda1d15b
  2. input: cy8c_cs: Report+sync vkeys on keyreset

    mdmower committed Apr 15, 2015
    When keylock reset is reached, report and sync unpressed state for
    virtual keys. From ville-jb-crc-3.4.10-0f5103e
    
    Change-Id: Id41f16821aa6cf9c6da44257d764b3b17abe95c6
  3. ipv6: Don't reduce hop limit for an interface

    Spindel authored and mdmower committed Mar 25, 2015
    A local route may have a lower hop_limit set than global routes do.
    
    RFC 3756, Section 4.2.7, "Parameter Spoofing"
    
    >   1.  The attacker includes a Current Hop Limit of one or another small
    >       number which the attacker knows will cause legitimate packets to
    >       be dropped before they reach their destination.
    
    >   As an example, one possible approach to mitigate this threat is to
    >   ignore very small hop limits.  The nodes could implement a
    >   configurable minimum hop limit, and ignore attempts to set it below
    >   said limit.
    
    Change-Id: I51ee1778e3d2d5fa1aefbdf1ad8869e4e8dc28b2
    Signed-off-by: D.S. Ljungmark <ljungmark@modio.se>
    Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support

    Kirill A. Shutemov authored and mdmower committed Dec 20, 2013
    Sasha Levin found a NULL pointer dereference that is due to a missing
    page table lock, which in turn is due to the pmd entry in question being
    a transparent huge-table entry.
    
    The code - introduced in commit 1998cc0 ("mm: make
    madvise(MADV_WILLNEED) support swap file prefetch") - correctly checks
    for this situation using pmd_none_or_trans_huge_or_clear_bad(), but it
    turns out that that function doesn't work correctly.
    
    pmd_none_or_trans_huge_or_clear_bad() expected that pmd_bad() would
    trigger if the transparent hugepage bit was set, but it doesn't do that
    if pmd_numa() is also set. Note that the NUMA bit only gets set on real
    NUMA machines, so people trying to reproduce this on most normal
    development systems would never actually trigger this.
    
    Fix it by removing the very subtle (and subtly incorrect) expectation,
    and instead just checking pmd_trans_huge() explicitly.
    
    Reported-by: Sasha Levin <sasha.levin@oracle.com>
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    [ Additionally remove the now stale test for pmd_trans_huge() inside the
      pmd_bad() case - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    
    Change-Id: I3f3763f236ef102de735297cd175cf514d40d28f
  5. vfs: read file_handle only once in handle_to_path

    sashalevin authored and mdmower committed Jan 29, 2015
    We used to read file_handle twice. Once to get the amount of extra bytes, and
    once to fetch the entire structure.
    
    This may be problematic since we do size verifications only after the first
    read, so if the number of extra bytes changes in userspace between the first
    and second calls, we'll have an incoherent view of file_handle.
    
    Instead, read the constant size once, and copy that over to the final
    structure without having to re-read it again.
    
    Change-Id: Ib05e5129629e27d5a05953098c5bc470fae40d2a
    Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Commits on Apr 10, 2015
  1. Merge "kernel: Restrict permissions of /proc/iomem."

    Linux Build Service Account Gerrit - the friendly Code Review server
    Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Apr 10, 2015
Commits on Apr 9, 2015
  1. msm: HTC: zara: add back NFC..

    brinlyau committed Apr 9, 2015
    * zara_cl supports NFC (I didn't realise this before)
    
    
    Change-Id: I24a26b88ef6179bc3177c73a6b10a44a42fc5764
  2. kernel: Restrict permissions of /proc/iomem.

    Biswajit Paul Gerrit - the friendly Code Review server
    Biswajit Paul authored and Gerrit - the friendly Code Review server committed Feb 9, 2015
    The permissions of /proc/iomem currently are -r--r--r--. Everyone can
    see its content. As iomem contains information about the physical memory
    content of the device, restrict the information only to root.
    
    Change-Id: If0be35c3fac5274151bea87b738a48e6ec0ae891
    CRs-Fixed: 786116
    Signed-off-by: Biswajit Paul <biswajitpaul@codeaurora.org>
    Signed-off-by: Avijit Kanti Das <avijitnsec@codeaurora.org>
Commits on Apr 8, 2015
  1. Merge "qseecom: avoid buffer over-write when copying app_name"

    Linux Build Service Account Gerrit - the friendly Code Review server
    Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Apr 8, 2015
Commits on Apr 7, 2015
  1. msm: HTC: Enable f2fs support for s4/m7/t6 devices

    jrior001 authored and mdmower committed Jun 26, 2014
    ... and regenerate defconfigs.
    
    Change-Id: I048b6fcefb6ec8e1e8badda915d339b9175af468
  2. fs: add f2fs support

    jrior001 authored and mdmower committed Mar 10, 2015
    Squashed import of f2fs filesystem from:
    https://kernel.googlesource.com/pub/scm/linux/kernel/git/jaegeuk/f2fs
    branch: linux-3.4
    
    Imports all relevant changes, up to and including commit:
      f2fs: support 3.4
      Author: Jaegeuk Kim <jaegeuk.kim@samsung.com>
      Date: Wed May 29 10:15:36 2013 +0900
      SHA1: adecc45
    
    Change-Id: I75179ebca9f83c83a923fe150a68f986ba712d68
Commits on Apr 2, 2015
  1. Merge "msm_vidc: Frame height is not updating for low resolution clip"

    Linux Build Service Account Gerrit - the friendly Code Review server
    Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Apr 2, 2015
Commits on Apr 1, 2015
  1. msm: HTC: Regenerate defconfigs

    jrior001 authored and intervigilium committed Mar 31, 2015
    Update for LZ4 kernel compression. All of elite, fighter, jet, m4, m7,
    t6, and ville were regenerated. Only these were affected.
    
    Change-Id: I75fb1b7b1ef38d85493bb4328216f160da0d2661
    (cherry picked from commit e9505b7)
  2. arm: Add support for LZ4-compressed kernel

    Kyungsik Lee authored and intervigilium committed Aug 9, 2013
    Date	Tue, 26 Feb 2013 15:24:29 +0900
    
    This patch integrates the LZ4 decompression code to the arm pre-boot code.
    And it depends on two patchs below
    
    lib: Add support for LZ4-compressed kernel
    decompressor: Add LZ4 decompressor module
    
    Signed-off-by: Kyungsik Lee <kyungsik.lee@lge.com>
    
    v2:
    - Apply CFLAGS, -Os to decompress.o to improve decompress
      performance during boot-up process
    
    Change-Id: Ic2fa8712ce919abc2cd0767672e97bd2c9177e25
    (cherry picked from commit 3767e0d)
  3. msm: HTC: zara: Moduleless defconfig

    mdmower authored and intervigilium committed Mar 31, 2015
    ... and regenerate (note removal of S5K4E5YX cam driver upon
    regeneration is fine since zara does not use it).
    
    Change-Id: I430f4956bbb9d787fdb076c2d5528025d2027b70
    (cherry picked from commit 9adb2ae)
Commits on Mar 31, 2015
  1. Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.16' into cm-12.1

    mdmower authored and intervigilium committed Mar 31, 2015
    Conflicts:
    	drivers/gpu/ion/ion.c
    	drivers/gpu/ion/ion_cma_heap.c
    	drivers/media/video/msm/actuators/msm_actuator.c
    	drivers/media/video/msm/cpp/msm_cpp.c
    	drivers/media/video/msm/csi/msm_csid.c
    	drivers/media/video/msm/msm_vpe.c
    	drivers/misc/qseecom.c
    
    Change-Id: Iba8bebe2bc49c9c70b848833ecda9ab4480fa3fd
Commits on Mar 30, 2015
  1. msm_vidc: Frame height is not updating for low resolution clip

    c_sridur Gerrit - the friendly Code Review server
    c_sridur authored and Gerrit - the friendly Code Review server committed Jan 23, 2015
    Fix: Update frame height preoperly for height lesser than 64
    
    Change-Id: I17cf166a40f77fcea74e7d0c19af801e6e6244d5
    Signed-off-by: c_sridur <sridur@codeaurora.org>
Commits on Mar 29, 2015
  1. Merge AU_LINUX_ANDROID_LA.AF.1.1_RB1.05.00.02.006.021 on remote branch

    Linux Build Service Account
    Linux Build Service Account committed Mar 29, 2015
    Change-Id: I867d3c909e1adfbe5fcca1b2f2e92de1b9153e5f
Commits on Mar 26, 2015
  1. msm_vidc: Frame height is not updating for low resolution clip

    c_sridur Gerrit - the friendly Code Review server
    c_sridur authored and Gerrit - the friendly Code Review server committed Jan 23, 2015
    Fix: Update frame height preoperly for height lesser than 64
    
    Change-Id: I17cf166a40f77fcea74e7d0c19af801e6e6244d5
    Signed-off-by: c_sridur <sridur@codeaurora.org>
Commits on Mar 25, 2015
  1. Merge "msm: camera: validate user space parameter for max and min value"

    Linux Build Service Account Gerrit - the friendly Code Review server
    Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Mar 25, 2015
Commits on Mar 24, 2015
  1. Merge "msm_fb: display: validate input args of mdp4_argc_process_writ…

    Linux Build Service Account Gerrit - the friendly Code Review server
    Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Mar 24, 2015
    …e_req"