Merge 4.14.91 into android-4.14-p

Changes in 4.14.91
	block: break discard submissions into the user defined size
	block: fix infinite loop if the device loses discard capability
	ASoC: sta32x: set ->component pointer in private struct
	ubifs: Fix directory size calculation for symlinks
	ib_srpt: Fix a use-after-free in __srpt_close_all_ch()
	perf record: Synthesize features before events in pipe mode
	cifs: integer overflow in in SMB2_ioctl()
	USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
	xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only
	USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
	USB: serial: option: add GosunCn ZTE WeLink ME3630
	USB: serial: option: add HP lt4132
	USB: serial: option: add Simcom SIM7500/SIM7600 (MBIM mode)
	USB: serial: option: add Fibocom NL668 series
	USB: serial: option: add Telit LN940 series
	scsi: sd: use mempool for discard special page
	mmc: core: Reset HPI enabled state during re-init and in case of errors
	mmc: core: Allow BKOPS and CACHE ctrl even if no HPI support
	mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl
	mmc: omap_hsmmc: fix DMA API warning
	gpio: max7301: fix driver for use with CONFIG_VMAP_STACK
	gpiolib-acpi: Only defer request_irq for GpioInt ACPI event handlers
	posix-timers: Fix division by zero bug
	kvm: x86: Add AMD's EX_CFG to the list of ignored MSRs
	KVM: Fix UAF in nested posted interrupt processing
	Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels
	x86/mtrr: Don't copy uninitialized gentry fields back to userspace
	panic: avoid deadlocks in re-entrant console drivers
	iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares
	iwlwifi: add new cards for 9560, 9462, 9461 and killer series
	spi: imx: add a device specific prepare_message callback
	spi: imx: mx51-ecspi: Move some initialisation to prepare_message hook.
	ubifs: Handle re-linking of inodes correctly while recovery
	mm: don't miss the last page because of round-off error
	proc/sysctl: don't return ENOMEM on lookup when a table is unregistering
	drm/ioctl: Fix Spectre v1 vulnerabilities
	Linux 4.14.91

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

diff --cc Makefile
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/mmc/core/mmc.c
Simple merge

diff --cc fs/ubifs/dir.c
index 518c1025588132be23ea11dd44edac971f8aaa56,4e6e32c0c08a405128f88bbdd0e9bcce1b837894..562c1d62a6c856080566b243ab3f4081611080c1
--- 1/fs/ubifs/dir.c
--- 2/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@@ -1147,9 -1147,9 +1147,8 @@@ static int ubifs_symlink(struct inode *
        struct ubifs_inode *ui;
        struct ubifs_inode *dir_ui = ubifs_inode(dir);
        struct ubifs_info *c = dir->i_sb->s_fs_info;
-       int err, len = strlen(symname);
-       int sz_change = CALC_DENT_SIZE(len);
+       int err, sz_change, len = strlen(symname);
 -      struct fscrypt_str disk_link = FSTR_INIT((char *)symname, len + 1);
 -      struct fscrypt_symlink_data *sd = NULL;
 +      struct fscrypt_str disk_link;
        struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
                                        .new_ino_d = ALIGN(len, 8),
                                        .dirtied_ino = 1 };