Merge branch android-3.10 into android-tegra-3.10
Merge conflict related to 3828b7d9e194f9a0cbc91d3f2c867b81a3e341f8 was
direct result of past merge causing errant code in
kernel/events/core.c perf_event_open():
mutex_lock_double(&gctx->mutex, &ctx->mutex);
mutex_lock(&gctx->mutex);
Requiring us to remove _both_ lines to fix and resolve the conflict.
When merging down, watch this fragment of code carefully.
05359192dcc0 UPSTREAM: tcp: tcp_make_synack() should use sock_wmalloc
432986fce6fe BACKPORT: FROMLIST: pids: make task_tgid_nr_ns() safe
0af544097729 ANDROID: check dir value of xfrm_userpolicy_id
1cead52a9b5f UPSTREAM: char: lp: fix possible integer overflow in lp_setup()
ad7edffc4e88 UPSTREAM: x86/acpi: Prevent out of bound access caused by broken ACPI tables
46defe5bddda BACKPORT: ANDROID: Use sk_uid to replace uid get from socket file
bd16fa5f56f8 UPSTREAM: tcp: tcp_make_synack() should use sock_wmalloc
bdc766f46237 ANDROID: keychord: Fix for a memory leak in keychord.
b5c574a489f8 ANDROID: keychord: Fix races in keychord_write.
a023848a1a67 Use %zu to print resid (size_t).
91e275eb53ae ANDROID: keychord: Fix a slab out-of-bounds read.
f8ed15567a7b UPSTREAM: brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
060d683dcf6a uid_sys_stats: fix overflow when io usage delta is negative
5a5d227d398c ANDROID: sdcardfs: override credential for ioctl to lower fs
3828b7d9e194 perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race
0f0f01773c1a UPSTREAM: af_key: Fix sadb_x_ipsecrequest parsing
d6611c662bcc UPSTREAM: scsi: sg: check length passed to SG_NEXT_CMD_LEN
efeee876b04b Revert "proc: smaps: Allow smaps access for CAP_SYS_RESOURCE"
f902a2b48848 ANDROID: sdcardfs: Remove unnecessary lock
3af4744b33d9 ANDROID: sdcardfs: use mount_nodev and fix a issue in sdcardfs_kill_sb
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 31495866
Bug: 64257838
Bug: 64256034
Bug: 64253928
Bug: 64483974
Bug: 64133562
Bug: 63974334
Bug: 63962952
Bug: 64258073
Bug: 64317562
Bug: 63260873
Bug: 37901413
Bug: 63963140
Bug: 63666227
Bug: 34951864
Bug: 36468447
Bug: 63785372
Change-Id: Ia5f5ec81599d9d1f429729c7576587b316a18779
