Merge 4.14.138 into android-4.14-q

Changes in 4.14.138
	scsi: fcoe: Embed fc_rport_priv in fcoe_rport structure
	ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV
	ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedo
	tcp: be more careful in tcp_fragment()
	arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
	HID: wacom: fix bit shift for Cintiq Companion 2
	HID: Add quirk for HP X1200 PIXART OEM mouse
	RDMA: Directly cast the sockaddr union to sockaddr
	IB: directly cast the sockaddr union to aockaddr
	objtool: Add machine_real_restart() to the noreturn list
	objtool: Add rewind_stack_do_exit() to the noreturn list
	atm: iphase: Fix Spectre v1 vulnerability
	ife: error out when nla attributes are empty
	ip6_tunnel: fix possible use-after-free on xmit
	net: bridge: delete local fdb on device init failure
	net: bridge: mcast: don't delete permanent entries when fast leave is enabled
	net: fix ifindex collision during namespace removal
	net/mlx5: Use reversed order when unregister devices
	net: phylink: Fix flow control for fixed-link
	net: sched: Fix a possible null-pointer dereference in dequeue_func()
	NFC: nfcmrvl: fix gpio-handling regression
	tipc: compat: allow tipc commands without arguments
	compat_ioctl: pppoe: fix PPPOEIOCSFWD handling
	net/mlx5e: Prevent encap flow counter update async to user query
	tun: mark small packets as owned by the tap sock
	mvpp2: refactor MTU change code
	bnx2x: Disable multi-cos feature.
	cgroup: Call cgroup_release() before __exit_signal()
	cgroup: Implement css_task_iter_skip()
	cgroup: Include dying leaders with live threads in PROCS iterations
	cgroup: css_task_iter_skip()'d iterators must be advanced before accessed
	cgroup: Fix css_task_iter_advance_css_set() cset skip condition
	spi: bcm2835: Fix 3-wire mode if DMA is enabled
	Linux 4.14.138

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

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc drivers/net/ppp/pptp.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc include/linux/cgroup-defs.h
Simple merge

diff --cc include/linux/cgroup.h
Simple merge

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

diff --cc kernel/cgroup/cgroup.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/l2tp/l2tp_ppp.c
Simple merge