Merge android-4.4.193 (3edc5af) into msm-4.4

* refs/heads/tmp-3edc5af
  Linux 4.4.193
  vhost: make sure log_num < in_num
  af_packet: tone down the Tx-ring unsupported spew.
  x86, boot: Remove multiple copy of static function sanitize_boot_params()
  clk: s2mps11: Add used attribute to s2mps11_dt_match
  scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
  vhost/test: fix build for vhost test
  xfrm: clean up xfrm protocol checks
  ALSA: hda/realtek - Fix overridden device-specific initialization
  ALSA: hda - Fix potential endless loop at applying quirks
  ANDROID: regression introduced override_creds=off

Change-Id: I2a9b4c63e3572bbfe461ace3ccc41451a6ef700c
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

diff --cc Makefile
Simple merge

diff --cc net/key/af_key.c
Simple merge