OSDN Git Service

Merge 4.4.193 into android-4.4
authorGreg Kroah-Hartman <gregkh@google.com>
Mon, 16 Sep 2019 07:48:34 +0000 (09:48 +0200)
committerGreg Kroah-Hartman <gregkh@google.com>
Mon, 16 Sep 2019 07:48:34 +0000 (09:48 +0200)
commit3edc5af3e74c297c6803bc84cbd3f7c81f3f78e6
tree6b113d28656d9fe5c89f687e4fd7f2bc7c2fd629
parent3dcafcc6c0ad243c1d6e8830625fdd3fe96bb608
parente19c5132f78a70cc53745558c0e728fecc74030a
Merge 4.4.193 into android-4.4

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: I184694e569ff2252cf7721d77b57229ca899f634
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Makefile
drivers/vhost/test.c
drivers/vhost/vhost.c
include/net/xfrm.h
net/xfrm/xfrm_state.c
net/xfrm/xfrm_user.c