Merge remote-tracking branch 'mirror-android-3.18' into android-hikey-linaro-3.18 * google-kernel/mirror-android-3.18: (1342 commits) ovl: filter of trusted xattr results in audit NFC: fix attrs checks in netlink interface Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set sch_cbq: validate TCA_CBQ_WRROPT to avoid crash net/rds: Fix error handling in rds_ib_add_one() sch_dsmark: fix potential NULL deref in dsmark_init() nfc: fix memory leak in llcp_sock_bind() net: qlogic: Fix memory leak in ql_alloc_large_buffers net: ipv4: avoid mixed n_redirects and rate_tokens usage ipv6: drop incoming packets having a v4mapped source address hso: fix NULL-deref on tty open CIFS: Fix oplock handling for SMB 2.1+ protocols i2c: riic: Clear NACK in tend isr hwrng: core - don't wait on add_early_randomness() quota: fix wrong condition in is_quota_modification() /dev/mem: Bail out upon SIGKILL. cfg80211: Purge frame registrations on iftype change btrfs: Relinquish CPUs in btrfs_compare_trees Btrfs: fix use-after-free when using the tree modification log alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP ... Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I9caa5364acd3e10879e46108da1d365e63b0b3a5
