Merge branch 'android-4.14-stable' into android-hikey-linaro-4.14
* android-4.14-stable: (2245 commits)
BACKPORT: psi: Fix uaf issue when psi trigger is destroyed while being polled
FROMGIT: Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
ANDROID: android-verity: Prevent double-freeing metadata
Linux 4.14.282
bpf: Enlarge offset check value to INT_MAX in bpf_skb_{load,store}_bytes
NFSD: Fix possible sleep during nfsd4_release_lockowner()
docs: submitting-patches: Fix crossref to 'The canonical patch format'
tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()
dm verity: set DM_TARGET_IMMUTABLE feature flag
dm stats: add cond_resched when looping over entries
dm crypt: make printing of the key constant-time
dm integrity: fix error code in dm_integrity_ctr()
zsmalloc: fix races between asynchronous zspage free and page migration
netfilter: conntrack: re-fetch conntrack after insertion
exec: Force single empty string when argv is empty
block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
drm/i915: Fix -Wstringop-overflow warning in call to intel_read_wm_latency()
assoc_array: Fix BUG_ON during garbage collect
drivers: i2c: thunderx: Allow driver to work with ACPI defined TWSI controllers
net: ftgmac100: Disable hardware checksum on AST2600
...
Test: boot with the hikey/hikey960 builds, and wifi works
Change-Id: Ibb19e556a4f41f6bc5940714d5068a1fd65b4e26
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
