Merge 4.4.193 into android-4.4-p

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

Change-Id: If2283bf8bc29f3deaf1c047c8ec9e502fbdf0521
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --cc Makefile
Simple merge

diff --cc drivers/vhost/test.c
Simple merge

diff --cc drivers/vhost/vhost.c
index c76c40d,eb7a4df..310a779
--- 1/drivers/vhost/vhost.c
--- 2/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@@ -1908,9 -1322,9 +1908,9 @@@ static int get_indirect(struct vhost_vi
                        return ret;
                }
                /* If this is an input descriptor, increment that count. */
 -              if (desc.flags & cpu_to_vhost16(vq, VRING_DESC_F_WRITE)) {
 +              if (access == VHOST_ACCESS_WO) {
                        *in_num += ret;
-                       if (unlikely(log)) {
+                       if (unlikely(log && ret)) {
                                log[*log_num].addr = vhost64_to_cpu(vq, desc.addr);
                                log[*log_num].len = vhost32_to_cpu(vq, desc.len);
                                ++*log_num;

diff --cc include/net/xfrm.h
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge