Commit graph

574573 commits

Author SHA1 Message Date
Linux Build Service Account
256b2a6656 Merge "skb: printing port numbers with gso trace events" 2016-09-08 14:32:08 -07:00
Linux Build Service Account
7824c2f62d Merge "msm: isp: buffer queue management specific flags" 2016-09-08 14:32:08 -07:00
Linux Build Service Account
30f2efabe2 Merge "msm: camera: sensor: Add state validation for flash" 2016-09-08 14:32:06 -07:00
Linux Build Service Account
0a838df5d0 Merge "msm: sensor: Enable combo mode in 10NM CSI PHY" 2016-09-08 14:32:05 -07:00
Linux Build Service Account
dddfe573e4 Merge "ARM: dts: msm: Voter clocks for mmss_camss_jpeg0_clk for msmcobalt" 2016-09-08 14:32:05 -07:00
Linux Build Service Account
38c15f8c17 Merge "msm: camera: jpegdma: Reg values stored in array at alternate indices" 2016-09-08 14:32:04 -07:00
Linux Build Service Account
c6855ffd7f Merge "ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()" 2016-09-07 08:48:18 -07:00
Linux Build Service Account
78b791996a Merge "power_supply: add two properties for step charging" 2016-09-07 08:48:17 -07:00
Linux Build Service Account
7d231bbeff Merge "msm: ipa: add dma test suite" 2016-09-07 08:48:17 -07:00
Linux Build Service Account
686b78cf2c Merge "PM / devfreq: bw_hwmon: Add HW offload support to governor" 2016-09-07 08:48:16 -07:00
Linux Build Service Account
31a7c9379d Merge "msm: vidc: Enhance debug capabilities of video driver" 2016-09-07 08:48:15 -07:00
Linux Build Service Account
391e79976f Merge "input: ft5x06: defer touch resume to workqueue" 2016-09-07 08:48:14 -07:00
Linux Build Service Account
86c1a9bea1 Merge "clk: msm: Select appropriate clock flags for 32-bit" 2016-09-07 08:48:13 -07:00
Linux Build Service Account
c9796e05e9 Merge "ARM: dts: msm: Update debug uart support for msmfalcon" 2016-09-07 08:48:13 -07:00
Linux Build Service Account
26745af012 Merge "ASoC: wcd934x: Adjust DMIC clock based on sample rate" 2016-09-07 03:21:49 -07:00
Linux Build Service Account
4565d3476b Merge "msm: ipa: fix skb recycle logic" 2016-09-07 03:21:49 -07:00
Linux Build Service Account
1836f9b5a7 Merge "msm: qdsp6v2: update CVD version" 2016-09-07 03:21:48 -07:00
Linux Build Service Account
f1bc206236 Merge "ASoC: sound: soc: fix incorrect max value" 2016-09-07 03:21:46 -07:00
Linux Build Service Account
73ae7e2aaf Merge "mmc: host: Add check for post tuning in HS400" 2016-09-07 03:21:45 -07:00
Linux Build Service Account
54ac6d78ba Merge "slim-msm: Differentiate SSR from Noise during power up" 2016-09-07 03:21:45 -07:00
Linux Build Service Account
2507a887d6 Merge "soc: qcom: rpm-smd: wait till all active set acks are cleared" 2016-09-07 03:21:44 -07:00
Linux Build Service Account
7773787201 Merge "usb: gsi: Queue control notification on gsi_resume" 2016-09-07 03:21:42 -07:00
Linux Build Service Account
894d547ff7 Merge "ASoC: wcd-mbhc: disable fake electrical interrupts" 2016-09-07 03:21:41 -07:00
Theodore Ts'o
86098795a0 ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()
We aren't checking to see if the in-inode extended attribute is
corrupted before we try to expand the inode's extra isize fields.

This can lead to potential crashes caused by the BUG_ON() check in
ext4_xattr_shift_entries().

Upstream commit: 9e92f48c34eb2b9af9d12f892e2fe1fce5e8ce35
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Change-Id: Ia66e005d04bf9eccb7febd8cb0733a67f9a4faf4
Git-commit: 1f002539e6da1e03cede84fb3416c58dae2f6f66
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:20:17 -07:00
Kirill Tkhai
92d978db31 ext4 crypto: fix memleak in ext4_readdir()
When ext4_bread() fails, fname_crypto_str remains
allocated after return. Fix that.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
CC: Dmitry Monakhov <dmonakhov@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@google.com>
Change-Id: Id3fc6ad39f771a0dbcab0c46a2df4f29cdb398f0
Git-commit: 7bf19038854f2bda589db4224124dee11968cdf3
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:19:12 -07:00
Theodore Ts'o
1a96d6dcbf ext4 crypto: revalidate dentry after adding or removing the key
Add a validation check for dentries for encrypted directory to make
sure we're not caching stale data after a key has been added or removed.

Also check to make sure that status of the encryption key is updated
when readdir(2) is executed.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Theodore Ts'o <tytso@google.com>
Git-commit: b4fd46149cbb118c6c2fa29f24391e79b87862b7
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Change-Id: I64ea95854de3c633b17bea0b63ab658e1524befb
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:18:38 -07:00
Harry Yang
192d510128 power_supply: add two properties for step charging
STEP_CHARGING_ENABLED indicates if step charging is enabled or not.
STEP_CHARGING_STEP reflects step charging phase.

Both properties are added for the purpose of testing and debugging.

CRs-Fixed: 1052854
Change-Id: I7d7517ab3f172016bb2f1c23fb2788bbd2d01086
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2016-09-07 00:45:05 -07:00
Ghanim Fodi
9f71cc9ade msm: ipa: add dma test suite
Add IPA DMA test suite to IPA driver. Different
tests are being added to cover different IPA
DMA functionalities.

CRs-Fixed: 1060507
Change-Id: Icf927ce1eb7107007e1cc5c7b5f0a63814510398
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2016-09-07 00:43:38 -07:00
zhaoyuan
5c6da5653e input: ft5x06: defer touch resume to workqueue
During device resume, the touch resume function is called after display's
resume. In this case, the ft5x06's resume function needs to wait for
200ms because of reset requirement. Defer the touch resume to a workqueue
to reduce the total device resume time. For this an optional DT property
is added to enable this on targets that need this feature.

Change-Id: Ib0677ca792aea83ece1caf8a0afff341302747fb
Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
2016-09-05 22:01:46 -07:00
Linux Build Service Account
11d6060fff Merge "ASoC: wcd934x: Update codec master clock configuration" 2016-09-05 16:21:42 -07:00
Linux Build Service Account
eb09c5c879 Merge "ASoC: wcd934x: Fix register default for MAD buffer interval" 2016-09-05 16:21:41 -07:00
Skylar Chang
bd09eb993a msm: ipa: fix skb recycle logic
skbs are recycled on LAN pipe. This changes
fixes a bug where the skb was freed before recycle.

Change-Id: I35734cd41aee8bdd2764d6307f76bedcb916a07b
CRs-Fixed: 1060534
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-09-05 01:35:20 -07:00
Linux Build Service Account
b1750ed67d Merge "msm: mdss: fix adaptive variable refresh and dynamic fps concurrency" 2016-09-02 13:52:54 -07:00
Linux Build Service Account
a48893e202 Merge "usb: phy: handle phy related regulators properly" 2016-09-02 13:52:53 -07:00
Linux Build Service Account
8965988fff Merge "input: ft5x06_ts: add sysfs to access touch module info" 2016-09-02 13:52:49 -07:00
Linux Build Service Account
c1786b559a Merge "input: ft5x06_ts: remove proximity sensor support" 2016-09-02 13:52:49 -07:00
Linux Build Service Account
1e7b2ab2a9 Merge "qcom-charger: smb138x: update FCC settings in smb_params table" 2016-09-02 13:52:48 -07:00
Linux Build Service Account
79317e6d4c Merge "qcom-charger: smb2: configure stat pin for parallel charging" 2016-09-02 13:52:47 -07:00
Linux Build Service Account
60e9bbd784 Merge "msm: ipa3: Fix timeout period of IPA resource add dependency" 2016-09-02 13:52:47 -07:00
Linux Build Service Account
11b7d7db0a Merge "Replace %p with %pK to prevent leaking kernel address" 2016-09-02 13:52:46 -07:00
Linux Build Service Account
cd601585c7 Merge "diag: Do not open glink channel twice" 2016-09-02 13:52:45 -07:00
Linux Build Service Account
91cdbb3b49 Merge "msm: ipa3: Fix wrong parameter to xdci release function" 2016-09-02 13:52:45 -07:00
Linux Build Service Account
24461c58d0 Merge "ARM: dts: msm: Update qusb2 efuse address for msmcobalt-v2" 2016-09-02 13:52:42 -07:00
Linux Build Service Account
46f0a3bc85 Merge "usb: phy: qusb: Update tune1 param from efuse register" 2016-09-02 13:52:42 -07:00
Linux Build Service Account
197b415098 Merge "tty: serial: msm: Add runtime PM and system sleep support" 2016-09-02 13:52:41 -07:00
Linux Build Service Account
6f11633832 Merge "netfilter: xt_quota2: 3.18 netlink notification fix" 2016-09-02 13:52:40 -07:00
Linux Build Service Account
604de7297c Merge "usb: dwc3: restart usb upon endpoint cmd timeout" 2016-09-02 13:52:40 -07:00
Linux Build Service Account
20a10f5e22 Merge "ipv4/GRO: Make GRO conform to RFC 6864" 2016-09-02 13:52:39 -07:00
Linux Build Service Account
aa1a5a622d Merge "ext4 crypto: simplify interfaces to directory entry insert functions" 2016-09-02 13:52:38 -07:00
Linux Build Service Account
12bc3939ae Merge "msm: mdss: Initialize pp_sts variable before use" 2016-09-02 13:52:38 -07:00