Merge 3.18.4 into android-3.18

Changes in 3.18.4:
	gre: fix the inner mac header in nbma tunnel xmit path
	net/mlx4: Cache line CQE/EQE stride fixes
	netlink: Always copy on mmap TX.
	netlink: Don't reorder loads/stores before marking mmap netlink frame as available
	geneve: Remove socket and offload handlers at destruction.
	geneve: Fix races between socket add and release.
	xen-netback: support frontends without feature-rx-notify again
	net: drop the packet when fails to do software segmentation or header check
	in6: fix conflict with glibc
	tg3: tg3_disable_ints using uninitialized mailbox value to disable interrupts
	batman-adv: Calculate extra tail size based on queued fragments
	batman-adv: Unify fragment size calculation
	batman-adv: avoid NULL dereferences and fix if check
	net/mlx4_en: Doorbell is byteswapped in Little Endian archs
	tcp6: don't move IP6CB before xfrm6_policy_check()
	net: Fix stacked vlan offload features computation
	net: Reset secmark when scrubbing packet
	net/core: Handle csum for CHECKSUM_COMPLETE VXLAN forwarding
	net: Generalize ndo_gso_check to ndo_features_check
	net/mlx4_core: Correcly update the mtt's offset in the MR re-reg flow
	tcp: Do not apply TSO segment limit to non-TSO packets
	xen-netback: fixing the propagation of the transmit shaper timeout
	alx: fix alx_poll()
	team: avoid possible underflow of count_pending value for notify_peers and mcast_rejoin
	enic: fix rx skb checksum
	drm/vmwgfx: Don't use memory accounting for kernel-side fence objects
	drm/vmwgfx: Fix error printout on signals pending
	drm/vmwgfx: Fix fence event code
	drm/ttm: Avoid memory allocation from shrinker functions.
	drm/fb_helper: move deferred fb checking into restore mode (v2)
	drm/dp: retry AUX transactions 32 times (v1.1)
	drm/dp-mst: Remove branches before dropping the reference
	drm/radeon: fix typo in CI dpm disable
	drm/radeon: work around a hw bug in MGCG on CIK
	drm/radeon: check the right ring in radeon_evict_flags()
	drm/radeon: KV has three PPLLs (v2)
	drm/radeon: fix sad_count check for dce3
	drm/radeon: adjust default bapm settings for KV
	drm/radeon: properly filter DP1.2 4k modes on non-DP1.2 hw
	drm/i915: Don't complain about stolen conflicts on gen3
	drm/i915: Disallow pin ioctl completely for kms drivers
	drm/i915: Only warn the first time we attempt to mmio whilst suspended
	drm/i915: resume MST after reading back hw state
	drm/i915: save/restore GMBUS freq across suspend/resume on gen4
	drm/nv4c/mc: disable msi
	drm/i915: Invalidate media caches on gen7
	drm/i915: Force the CS stall for invalidate flushes
	drm/i915: Disable PSMI sleep messages on all rings around context switches
	drm/i915: Don't call intel_prepare_page_flip() multiple times on gen2-4
	drm/irq: BUG_ON() -> WARN_ON()
	ARC: [nsimosci] move peripherals to match model to FPGA
	cxl: Change contexts_lock to a mutex to fix sleep while atomic bug
	cxl: Add timeout to process element commands
	cxl: Unmap MMIO regions when detaching a context
	xhci: Check if slot is already in default state before moving it there
	xhci: Add broken-streams quirk for Fresco Logic FL1000G xhci controllers
	nl80211: check matches array length before acessing it
	cfg80211: don't WARN about two consecutive Country IE hint
	cfg80211: avoid mem leak on driver hint set
	cfg80211: Fix 160 MHz channels with 80+80 and 160 MHz drivers
	rtlwifi: rtl8192ce: Set fw_ready flag
	rtlwifi: Fix error when accessing unmapped memory in skb
	asus-nb-wmi: Add another wapf=4 quirk
	hp_accel: Add support for HP ZBook 15
	tick/powerclamp: Remove tick_nohz_idle abuse
	uapi/linux/target_core_user.h: fix headers_install.sh badness
	tcm_loop: Fix wrong I_T nexus association
	IB/iser: Fix possible SQ overflow
	genirq: Prevent proc race against freeing of irq descriptors
	iscsi-target: Fail connection on short sendmsg writes
	iscsi,iser-target: Initiate termination only once
	iser-target: Fix flush + disconnect completion handling
	iser-target: Parallelize CM connection establishment
	iser-target: Fix connected_handler + teardown flow race
	iser-target: Handle ADDR_CHANGE event for listener cm_id
	iser-target: Fix implicit termination of connections
	iser-target: Allocate PI contexts dynamically
	iser-target: Fix NULL dereference in SW mode DIF
	iscsi,iser-target: Expose supported protection ops according to t10_pi
	Revert "drm/i915: Preserve VGACNTR bits from the BIOS"
	Revert "[SCSI] mpt2sas: Remove phys on topology change."
	Revert "[SCSI] mpt3sas: Remove phys on topology change"
	scsi: blacklist RSOC for Microsoft iSCSI target devices
	scsi: fix random memory corruption with scsi-mq + T10 PI
	SCSI: fix regression in scsi_send_eh_cmnd()
	clk: samsung: Fix double add of syscore ops after driver rebind
	clk: Really fix deadlock with mmap_sem
	clk: Don't try to use a struct clk* after it could have been freed
	Revert "clk: ppc-corenet: Fix Section mismatch warning"
	clk: rockchip: fix rk3288 cpuclk core dividers
	clk: rockchip: fix rk3066 pll lock bit location
	clk: berlin: bg2q: remove non-exist "smemc" gate clock
	clk: at91: keep slow clk enabled to prevent system hang
	ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host
	bugon.cocci: fix Options at the macro
	dm: fix missed error code if .end_io isn't implemented by target_type
	parisc: fix out-of-register compiler error in ldcw inline assembler function
	serial: fix parisc boot hang
	storvsc: ring buffer failures may result in I/O freeze
	net: ethernet: cpsw: fix hangs with interrupts
	x86/build: Clean auto-generated processor feature files
	video/logo: prevent use of logos after they have been freed
	video/fbdev: fix defio's fsync
	smiapp-pll: Correct clock debug prints
	af9005: fix kernel panic on init if compiled without IR
	smiapp: Take mutex during PLL update in sensor initialisation
	sound: simplify au0828 quirk table
	sound: Update au0828 quirks table
	uvcvideo: Fix destruction order in uvc_delete()
	img-ir/hw: Always read data to clear buffer
	img-ir/hw: Fix potential deadlock stopping timer
	vivid: fix CROP_BOUNDS typo for video output
	vfio-pci: Fix the check on pci device type in vfio_pci_probe()
	locks: fix NULL-deref in generic_delete_lease
	powernv: Fix OPAL tracepoint code
	mmc: sdhci: Set SDHCI_POWER_ON with external vmmc
	arm64: partially revert "ARM: 8167/1: extend the reserved memory for initrd to be page aligned"
	iwlwifi: mvm: fix Rx with both chains
	i40e: adds FCoE configure option
	drivers: net: cpsw: fix multicast flush in dual emac mode
	leds: netxbig: fix oops at probe time
	ftrace/jprobes/x86: Fix conflict between jprobes and function graph tracing
	ftrace: Fix updating of filters for shared global_ops filters
	ftrace: Check both notrace and filter for old hash
	NFSv4.1: Fix client id trunking on Linux
	mei: clean reset bit before reset
	uas: Add US_FL_NO_ATA_1X for Seagate devices with usb-id 0bc2:a013
	uas: Add US_FL_NO_REPORT_OPCODES for JMicron JMS566 with usb-id 0bc2:a013
	uas: Add US_FL_NO_ATA_1X for 2 more Seagate disk enclosures
	reset: sunxi: fix spinlock initialization
	ARM: dts: berlin: correct BG2Q's SM GPIO location.
	pinctrl: lantiq: remove bogus of_gpio_chip_add
	gpiolib: of: Correct error handling in of_get_named_gpiod_flags
	gpio: crystalcove: use handle_nested_irq
	gpio: fix memory and reference leaks in gpiochip_add error path
	gpio: fix memory leak and sleep-while-atomic
	gpio: fix sleep-while-atomic in gpiochip_remove
	gpio: sysfs: fix gpio-chip device-attribute leak
	gpio: sysfs: fix gpio device-attribute leak
	OHCI: add a quirk for ULi M5237 blocking on reset
	usb: dwc3: gadget: Fix TRB preparation during SG
	usb: dwc3: gadget: Stop TRB preparation after limit is reached
	USB: cp210x: fix ID for production CEL MeshConnect USB Stick
	USB: cp210x: add IDs for CEL USB sticks and MeshWorks devices
	USB: qcserial/option: make AT URCs work for Sierra Wireless MC73xx
	USB: keyspan: fix null-deref at probe
	usb: gadget: gadgetfs: Free memory allocated by memdup_user()
	usb: gadget: udc: atmel: change setting for DMA
	usb: gadget: udc: atmel: fix possible IN hang issue
	usb: gadget: udc: atmel: fix possible oops when unloading module
	USB: console: fix uninitialised ldisc semaphore
	USB: console: fix potential use after free
	USB: EHCI: fix initialization bug in iso_stream_schedule()
	usb: musb: stuff leak of struct usb_hcd
	can: kvaser_usb: Don't free packets when tight on URBs
	can: kvaser_usb: Reset all URB tx contexts upon channel close
	can: kvaser_usb: Don't send a RESET_CHIP for non-existing channels
	Input: elantech - support new ICs types for version 4
	Input: i8042 - reset keyboard to fix Elantech touchpad detection
	Input: I8042 - add Acer Aspire 7738 to the nomux list
	ARM: omap2plus_defconfig: use CONFIG_CPUFREQ_DT
	ARM: imx6sx: Set PLL2 as parent of QSPI clocks
	ARM: dts: imx25: Fix the SPI1 clocks
	ARM: dts: imx51-babbage: Fix ULPI PHY reset modelling
	ARM: imx6q: drop unnecessary semicolon
	ARM: clk-imx6q: fix video divider for rev T0 1.0
	ARM: omap5/dra7xx: Fix frequency typos
	ARM: omap5/dra7xx: Enable booting secondary CPU in HYP mode
	bus: omap_l3_noc: Add resume hook to restore context
	bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler
	ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT
	ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances
	ARM: dts: dra7-evm: fix qspi device tree partition size
	iio: ad799x: Fix ad7991/ad7995/ad7999 config setup
	decompress_bunzip2: off by one in get_next_block()
	um: Skip futex_atomic_cmpxchg_inatomic() test
	x86, um: actually mark system call tables readonly
	kbuild: Fix removal of the debian/ directory
	LOCKD: Fix a race when initialising nlmsvc_timeout
	target: Drop arbitrary maximum I/O size limit
	vhost-scsi: Add missing virtio-scsi -> TCM attribute conversion
	drm/i915: Kill check_power_well() calls
	KVM: nVMX: Disable unrestricted mode if ept=0
	Linux 3.18.4

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