Merge 4.14.97 into android-4.14-p

Changes in 4.14.97
	amd-xgbe: Fix mdio access for non-zero ports and clause 45 PHYs
	net: bridge: Fix ethernet header pointer before check skb forwardable
	net: Fix usage of pskb_trim_rcsum
	net: phy: mdio_bus: add missing device_del() in mdiobus_register() error handling
	net_sched: refetch skb protocol for each filter
	openvswitch: Avoid OOB read when parsing flow nlattrs
	vhost: log dirty page correctly
	net: ipv4: Fix memory leak in network namespace dismantle
	tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state
	ipfrag: really prevent allocation on netns exit
	mmc: Kconfig: Enable CONFIG_MMC_SDHCI_IO_ACCESSORS
	mei: me: add denverton innovation engine device IDs
	USB: serial: simple: add Motorola Tetra TPG2200 device id
	USB: serial: pl2303: add new PID to support PL2303TB
	ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
	ASoC: rt5514-spi: Fix potential NULL pointer dereference
	ALSA: hda - Add mute LED support for HP ProBook 470 G5
	ARCv2: lib: memeset: fix doing prefetchw outside of buffer
	ARC: adjust memblock_reserve of kernel memory
	ARC: perf: map generic branches to correct hardware condition
	s390/early: improve machine detection
	s390/smp: fix CPU hotplug deadlock with CPU rescan
	char/mwave: fix potential Spectre v1 vulnerability
	staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
	tty: Handle problem if line discipline does not have receive_buf
	uart: Fix crash in uart_write and uart_put_char
	tty/n_hdlc: fix __might_sleep warning
	hv_balloon: avoid touching uninitialized struct page during tail onlining
	Drivers: hv: vmbus: Check for ring when getting debug info
	CIFS: Fix possible hang during async MTU reads and writes
	CIFS: Fix credits calculations for reads with errors
	CIFS: Fix credit calculation for encrypted reads with errors
	CIFS: Do not reconnect TCP session in add_credits()
	Input: xpad - add support for SteelSeries Stratus Duo
	compiler.h: enable builtin overflow checkers and add fallback code
	Input: uinput - fix undefined behavior in uinput_validate_absinfo()
	acpi/nfit: Block function zero DSMs
	acpi/nfit: Fix command-supported detection
	dm thin: fix passdown_double_checking_shared_status()
	dm crypt: fix parsing of extended IV arguments
	KVM: x86: Fix single-step debugging
	x86/pkeys: Properly copy pkey state at fork()
	x86/selftests/pkeys: Fork() to check for state being preserved
	x86/kaslr: Fix incorrect i8254 outb() parameters
	posix-cpu-timers: Unbreak timer rearming
	irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size
	can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
	can: bcm: check timer values before ktime conversion
	vt: invoke notifier on screen size change
	perf unwind: Unwind with libdw doesn't take symfs into account
	perf unwind: Take pgoff into account when reporting elf to libdwfl
	Revert "seccomp: add a selftest for get_metadata"
	net: stmmac: Use correct values in TQS/RQS fields
	KVM: x86: Fix a 4.14 backport regression related to userspace/guest FPU
	s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
	nvmet-rdma: Add unlikely for response allocated check
	nvmet-rdma: fix null dereference under heavy load
	usb: dwc3: gadget: Clear req->needs_extra_trb flag on cleanup
	xhci: Fix leaking USB3 shared_hcd at xhci removal
	ptp_kvm: probe for kvm guest availability
	x86/pvclock: add setter for pvclock_pvti_cpu0_va
	x86/xen/time: set pvclock flags on xen_time_init()
	x86/xen/time: setup vcpu 0 time info page
	x86/xen/time: Output xen sched_clock time from 0
	xen: Fix x86 sched_clock() interface for xen
	f2fs: read page index before freeing
	btrfs: fix error handling in btrfs_dev_replace_start
	btrfs: dev-replace: go back to suspended state if target device is missing
	Linux 4.14.97

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

diff --cc Makefile
Simple merge

diff --cc fs/f2fs/node.c
index bc764f46ecca47a7403a0f3cee344fb66aa83539,12060fbfbb05eb605349d1b89ec4c5bb14bb0933..a4290c79fb246bffa85c6ded2421e3e97bc83a2c
--- 1/fs/f2fs/node.c
--- 2/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@@ -733,8 -694,10 +733,9 @@@ static void truncate_node(struct dnode_
  {
        struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
        struct node_info ni;
+       pgoff_t index;
  
        get_node_info(sbi, dn->nid, &ni);
 -      f2fs_bug_on(sbi, ni.blk_addr == NULL_ADDR);
  
        /* Deallocate node address */
        invalidate_blocks(sbi, ni.blk_addr);

diff --cc include/linux/compiler-clang.h
index c456227e898efe854bae16a7e095cf8628d90193,673fa522a7aba6215f6c7566c880de00db0ea406..6c5b4d73713e167bd08b97a5a4e44df7d9b85335
--- 1/include/linux/compiler-clang.h
--- 2/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
@@@ -25,11 -25,16 +25,25 @@@
  #undef __noretpoline
  #endif
  
 +#ifdef CONFIG_LTO_CLANG
 +#ifdef CONFIG_FTRACE_MCOUNT_RECORD
 +#define __norecordmcount \
 +      __attribute__((__section__(".text..ftrace")))
 +#endif
 +
 +#define __nocfi               __attribute__((no_sanitize("cfi")))
 +#endif
++
+ /*
+  * Not all versions of clang implement the the type-generic versions
+  * of the builtin overflow checkers. Fortunately, clang implements
+  * __has_builtin allowing us to avoid awkward version
+  * checks. Unfortunately, we don't know which version of gcc clang
+  * pretends to be, so the macro may or may not be defined.
+  */
+ #undef COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW
+ #if __has_builtin(__builtin_mul_overflow) && \
+     __has_builtin(__builtin_add_overflow) && \
+     __has_builtin(__builtin_sub_overflow)
+ #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
+ #endif