Merge 4.14.74 into android-4.14

Changes in 4.14.74
	crypto: skcipher - Fix -Wstringop-truncation warnings
	iio: adc: ina2xx: avoid kthread_stop() with stale task_struct
	tsl2550: fix lux1_input error in low light
	vmci: type promotion bug in qp_host_get_user_memory()
	x86/numa_emulation: Fix emulated-to-physical node mapping
	staging: rts5208: fix missing error check on call to rtsx_write_register
	power: supply: axp288_charger: Fix initial constant_charge_current value
	misc: sram: enable clock before registering regions
	serial: sh-sci: Stop RX FIFO timer during port shutdown
	uwb: hwa-rc: fix memory leak at probe
	power: vexpress: fix corruption in notifier registration
	iommu/amd: make sure TLB to be flushed before IOVA freed
	Bluetooth: Add a new Realtek 8723DE ID 0bda:b009
	USB: serial: kobil_sct: fix modem-status error handling
	6lowpan: iphc: reset mac_header after decompress to fix panic
	iommu/msm: Don't call iommu_device_{,un}link from atomic context
	s390/mm: correct allocate_pgste proc_handler callback
	power: remove possible deadlock when unregistering power_supply
	md-cluster: clear another node's suspend_area after the copy is finished
	RDMA/bnxt_re: Fix a couple off by one bugs
	RDMA/i40w: Hold read semaphore while looking after VMA
	IB/core: type promotion bug in rdma_rw_init_one_mr()
	media: exynos4-is: Prevent NULL pointer dereference in __isp_video_try_fmt()
	IB/mlx4: Test port number before querying type.
	powerpc/kdump: Handle crashkernel memory reservation failure
	media: fsl-viu: fix error handling in viu_of_probe()
	media: staging/imx: fill vb2_v4l2_buffer field entry
	x86/tsc: Add missing header to tsc_msr.c
	ARM: hwmod: RTC: Don't assume lock/unlock will be called with irq enabled
	x86/entry/64: Add two more instruction suffixes
	ARM: dts: ls1021a: Add missing cooling device properties for CPUs
	scsi: target/iscsi: Make iscsit_ta_authentication() respect the output buffer size
	scsi: klist: Make it safe to use klists in atomic context
	scsi: ibmvscsi: Improve strings handling
	scsi: target: Avoid that EXTENDED COPY commands trigger lock inversion
	usb: wusbcore: security: cast sizeof to int for comparison
	ath10k: sdio: use same endpoint id for all packets in a bundle
	ath10k: sdio: set skb len for all rx packets
	powerpc/powernv/ioda2: Reduce upper limit for DMA window size
	s390/sysinfo: add missing #ifdef CONFIG_PROC_FS
	alarmtimer: Prevent overflow for relative nanosleep
	s390/dasd: correct numa_node in dasd_alloc_queue
	s390/scm_blk: correct numa_node in scm_blk_dev_setup
	s390/extmem: fix gcc 8 stringop-overflow warning
	mtd: rawnand: atmel: add module param to avoid using dma
	iio: accel: adxl345: convert address field usage in iio_chan_spec
	posix-timers: Make forward callback return s64
	posix-timers: Sanitize overrun handling
	ALSA: snd-aoa: add of_node_put() in error path
	media: s3c-camif: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power
	media: soc_camera: ov772x: correct setting of banding filter
	media: omap3isp: zero-initialize the isp cam_xclk{a,b} initial data
	staging: android: ashmem: Fix mmap size validation
	drivers/tty: add error handling for pcmcia_loop_config
	media: tm6000: add error handling for dvb_register_adapter
	ALSA: hda: Add AZX_DCAPS_PM_RUNTIME for AMD Raven Ridge
	net: phy: xgmiitorgmii: Check read_status results
	ath10k: protect ath10k_htt_rx_ring_free with rx_ring.lock
	net: phy: xgmiitorgmii: Check phy_driver ready before accessing
	drm/sun4i: Fix releasing node when enumerating enpoints
	ath10k: transmit queued frames after processing rx packets
	rndis_wlan: potential buffer overflow in rndis_wlan_auth_indication()
	brcmsmac: fix wrap around in conversion from constant to s16
	wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()
	ARM: mvebu: declare asm symbols as character arrays in pmsu.c
	arm: dts: mediatek: Add missing cooling device properties for CPUs
	HID: hid-ntrig: add error handling for sysfs_create_group
	MIPS: boot: fix build rule of vmlinux.its.S
	perf/x86/intel/lbr: Fix incomplete LBR call stack
	scsi: bnx2i: add error handling for ioremap_nocache
	iomap: complete partial direct I/O writes synchronously
	scsi: megaraid_sas: Update controller info during resume
	EDAC, i7core: Fix memleaks and use-after-free on probe and remove
	ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs
	module: exclude SHN_UNDEF symbols from kallsyms api
	gpio: Fix wrong rounding in gpio-menz127
	nfsd: fix corrupted reply to badly ordered compound
	EDAC: Fix memleak in module init error path
	fs/lock: skip lock owner pid translation in case we are in init_pid_ns
	Input: xen-kbdfront - fix multi-touch XenStore node's locations
	iio: 104-quad-8: Fix off-by-one error in register selection
	ARM: dts: dra7: fix DCAN node addresses
	floppy: Do not copy a kernel pointer to user memory in FDGETPRM ioctl
	x86/mm: Expand static page table for fixmap space
	tty: serial: lpuart: avoid leaking struct tty_struct
	serial: cpm_uart: return immediately from console poll
	intel_th: Fix device removal logic
	spi: tegra20-slink: explicitly enable/disable clock
	spi: sh-msiof: Fix invalid SPI use during system suspend
	spi: sh-msiof: Fix handling of write value for SISTR register
	spi: rspi: Fix invalid SPI use during system suspend
	spi: rspi: Fix interrupted DMA transfers
	regulator: fix crash caused by null driver data
	USB: fix error handling in usb_driver_claim_interface()
	USB: handle NULL config in usb_find_alt_setting()
	usb: musb: dsps: do not disable CPPI41 irq in driver teardown
	slub: make ->cpu_partial unsigned int
	media: uvcvideo: Support realtek's UVC 1.5 device
	USB: usbdevfs: sanitize flags more
	USB: usbdevfs: restore warning for nonsensical flags
	Revert "usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()"
	USB: remove LPM management from usb_driver_claim_interface()
	Input: elantech - enable middle button of touchpad on ThinkPad P72
	IB/srp: Avoid that sg_reset -d ${srp_device} triggers an infinite loop
	IB/hfi1: Fix SL array bounds check
	IB/hfi1: Invalid user input can result in crash
	IB/hfi1: Fix context recovery when PBC has an UnsupportedVL
	RDMA/uverbs: Atomically flush and mark closed the comp event queue
	ovl: hash non-dir by lower inode for fsnotify
	drm/i915: Remove vma from object on destroy, not close
	serial: imx: restore handshaking irq for imx1
	arm64: KVM: Tighten guest core register access from userspace
	qed: Wait for ready indication before rereading the shmem
	qed: Wait for MCP halt and resume commands to take place
	qed: Prevent a possible deadlock during driver load and unload
	qed: Avoid sending mailbox commands when MFW is not responsive
	thermal: of-thermal: disable passive polling when thermal zone is disabled
	isofs: reject hardware sector size > 2048 bytes
	tls: possible hang when do_tcp_sendpages hits sndbuf is full case
	bpf: sockmap: write_space events need to be passed to TCP handler
	net: hns: fix length and page_offset overflow when CONFIG_ARM64_64K_PAGES
	net: hns: fix skb->truesize underestimation
	e1000: check on netif_running() before calling e1000_up()
	e1000: ensure to free old tx/rx rings in set_ringparam()
	crypto: cavium/nitrox - fix for command corruption in queue full case with backlog submissions.
	hwmon: (ina2xx) fix sysfs shunt resistor read access
	hwmon: (adt7475) Make adt7475_read_word() return errors
	Revert "ARM: dts: imx7d: Invert legacy PCI irq mapping"
	drm/amdgpu: Enable/disable gfx PG feature in rlc safe mode
	drm/amdgpu: Update power state at the end of smu hw_init.
	ata: ftide010: Add a quirk for SQ201
	nvme-fcloop: Fix dropped LS's to removed target port
	ARM: dts: omap4-droid4: Fix emmc errors seen on some devices
	arm/arm64: smccc-1.1: Make return values unsigned long
	arm/arm64: smccc-1.1: Handle function result as parameters
	i2c: i801: Allow ACPI AML access I/O ports not reserved for SMBus
	x86/pti: Fix section mismatch warning/error
	arm64: KVM: Sanitize PSTATE.M when being set from userspace
	media: v4l: event: Prevent freeing event subscriptions while accessed
	Linux 4.14.74

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

diff --cc Makefile
Simple merge

diff --cc drivers/edac/edac_mc_sysfs.c
Simple merge

diff --cc drivers/staging/android/ashmem.c
Simple merge

diff --cc include/linux/arm-smccc.h
index 43072b1fde0c6846eb530153601719642e33aea6,18863d56273cc7ea144bfaf366a2c74755ee72c9..9f721ee6690d2b62f23c4c0dc0c379e63f3a7b3b
--- 1/include/linux/arm-smccc.h
--- 2/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@@ -201,47 -199,57 +201,57 @@@ asmlinkage void __arm_smccc_hvc(unsigne
  
  #define __declare_arg_0(a0, res)                                      \
        struct arm_smccc_res   *___res = res;                           \
-       register u32           r0 SMCCC_REG(0) = a0;                    \
 -      register unsigned long r0 asm("r0") = (u32)a0;                  \
 -      register unsigned long r1 asm("r1");                            \
 -      register unsigned long r2 asm("r2");                            \
 -      register unsigned long r3 asm("r3")
++      register unsigned long r0 SMCCC_REG(0) = (u32)a0;               \
 +      register unsigned long r1 SMCCC_REG(1);                         \
 +      register unsigned long r2 SMCCC_REG(2);                         \
 +      register unsigned long r3 SMCCC_REG(3)
  
  #define __declare_arg_1(a0, a1, res)                                  \
+       typeof(a1) __a1 = a1;                                           \
        struct arm_smccc_res   *___res = res;                           \
-       register u32           r0 SMCCC_REG(0) = a0;                    \
-       register typeof(a1)    r1 SMCCC_REG(1) = a1;                    \
 -      register unsigned long r0 asm("r0") = (u32)a0;                  \
 -      register unsigned long r1 asm("r1") = __a1;                     \
 -      register unsigned long r2 asm("r2");                            \
 -      register unsigned long r3 asm("r3")
++      register unsigned long r0 SMCCC_REG(0) = (u32)a0;               \
++      register unsigned long r1 SMCCC_REG(1) = __a1;                  \
 +      register unsigned long r2 SMCCC_REG(2);                         \
 +      register unsigned long r3 SMCCC_REG(3)
  
  #define __declare_arg_2(a0, a1, a2, res)                              \
+       typeof(a1) __a1 = a1;                                           \
+       typeof(a2) __a2 = a2;                                           \
        struct arm_smccc_res   *___res = res;                           \
-       register u32           r0 SMCCC_REG(0) = a0;                    \
-       register typeof(a1)    r1 SMCCC_REG(1) = a1;                    \
-       register typeof(a2)    r2 SMCCC_REG(2) = a2;                    \
 -      register unsigned long r0 asm("r0") = (u32)a0;                  \
 -      register unsigned long r1 asm("r1") = __a1;                     \
 -      register unsigned long r2 asm("r2") = __a2;                     \
 -      register unsigned long r3 asm("r3")
++      register unsigned long r0 SMCCC_REG(0) = (u32)a0;               \
++      register unsigned long r1 SMCCC_REG(1) = __a1;                  \
++      register unsigned long r2 SMCCC_REG(2) = __a2;                  \
 +      register unsigned long r3 SMCCC_REG(3)
  
  #define __declare_arg_3(a0, a1, a2, a3, res)                          \
+       typeof(a1) __a1 = a1;                                           \
+       typeof(a2) __a2 = a2;                                           \
+       typeof(a3) __a3 = a3;                                           \
        struct arm_smccc_res   *___res = res;                           \
-       register u32           r0 SMCCC_REG(0) = a0;                    \
-       register typeof(a1)    r1 SMCCC_REG(1) = a1;                    \
-       register typeof(a2)    r2 SMCCC_REG(2) = a2;                    \
-       register typeof(a3)    r3 SMCCC_REG(3) = a3
 -      register unsigned long r0 asm("r0") = (u32)a0;                  \
 -      register unsigned long r1 asm("r1") = __a1;                     \
 -      register unsigned long r2 asm("r2") = __a2;                     \
 -      register unsigned long r3 asm("r3") = __a3
++      register unsigned long r0 SMCCC_REG(0) = (u32)a0;               \
++      register unsigned long r1 SMCCC_REG(1) = __a1;                  \
++      register unsigned long r2 SMCCC_REG(2) = __a2;                  \
++      register unsigned long r3 SMCCC_REG(3) = __a3
  
  #define __declare_arg_4(a0, a1, a2, a3, a4, res)                      \
+       typeof(a4) __a4 = a4;                                           \
        __declare_arg_3(a0, a1, a2, a3, res);                           \
-       register typeof(a4) r4 SMCCC_REG(4) = a4
 -      register unsigned long r4 asm("r4") = __a4
++      register unsigned long r4 SMCCC_REG(4) = __a4
  
  #define __declare_arg_5(a0, a1, a2, a3, a4, a5, res)                  \
+       typeof(a5) __a5 = a5;                                           \
        __declare_arg_4(a0, a1, a2, a3, a4, res);                       \
-       register typeof(a5) r5 SMCCC_REG(5) = a5
 -      register unsigned long r5 asm("r5") = __a5
++      register unsigned long r5 SMCCC_REG(5) = __a5
  
  #define __declare_arg_6(a0, a1, a2, a3, a4, a5, a6, res)              \
+       typeof(a6) __a6 = a6;                                           \
        __declare_arg_5(a0, a1, a2, a3, a4, a5, res);                   \
-       register typeof(a6) r6 SMCCC_REG(6) = a6
 -      register unsigned long r6 asm("r6") = __a6
++      register unsigned long r6 SMCCC_REG(6) = __a6
  
  #define __declare_arg_7(a0, a1, a2, a3, a4, a5, a6, a7, res)          \
+       typeof(a7) __a7 = a7;                                           \
        __declare_arg_6(a0, a1, a2, a3, a4, a5, a6, res);               \
-       register typeof(a7) r7 SMCCC_REG(7) = a7
 -      register unsigned long r7 asm("r7") = __a7
++      register unsigned long r7 SMCCC_REG(7) = __a7
  
  #define ___declare_args(count, ...) __declare_arg_ ## count(__VA_ARGS__)
  #define __declare_args(count, ...)  ___declare_args(count, __VA_ARGS__)

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

diff --cc kernel/bpf/sockmap.c
Simple merge

diff --cc kernel/module.c
Simple merge