Merge 3.18.25 into android-3.18

Changes in 3.18.25:
	jbd2: avoid infinite loop when destroying aborted journal
	l2tp: protect tunnel->del_work by ref_count
	af_unix: Convert the unix_sk macro to an inline function for type safety
	af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag
	net/unix: fix logic about sk_peek_offset
	skbuff: Fix skb checksum flag on skb pull
	skbuff: Fix skb checksum partial check.
	net: add pfmemalloc check in sk_add_backlog()
	ppp: don't override sk->sk_state in pppoe_flush_dev()
	ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
	crypto: sparc - initialize blkcipher.ivsize
	crypto: ahash - ensure statesize is non-zero
	btrfs: fix use after free iterating extrefs
	arm64: errata: use KBUILD_CFLAGS_MODULE for erratum #843419
	i2c: rcar: enable RuntimePM before registering to the core
	i2c: s3c2410: enable RuntimePM before registering to the core
	i2c: designware: Do not use parameters from ACPI on Dell Inspiron 7348
	workqueue: make sure delayed work run in local cpu
	drm/nouveau/fbcon: take runpm reference when userspace has an open fd
	drm/radeon: add pm sysfs files late
	dm thin: fix missing pool reference count decrement in pool_ctr error path
	rbd: fix double free on rbd_dev->header_name
	lib/radix-tree.c: change to simpler include
	ath9k: declare required extra tx headroom
	iwlwifi: dvm: fix D3 firmware PN programming
	iwlwifi: fix firmware filename for 3160
	iwlwifi: pcie: support 7265-D devices
	iwlwifi: mvm: fix D3 firmware PN programming
	iwlwifi: pci: add a few more PCI subvendor IDs for the 7265 series
	iommu/amd: Don't clear DTE flags when modifying it
	powerpc/rtas: Validate rtas.entry before calling enter_rtas()
	ASoC: wm8904: Correct number of EQ registers
	mm: make sendfile(2) killable
	sfc: Fix memcpy() with const destination compiler warning.
	power: bq24190_charger: suppress build warning
	drm/nouveau/gem: return only valid domain when there's only one
	drm/i915: Restore lost DPLL register write on gen2-4
	drm/radeon: don't try to recreate sysfs entries on resume
	iio: mxs-lradc: Fix temperature offset
	rbd: require stable pages if message data CRCs are enabled
	Revert "ARM64: unwind: Fix PC calculation"
	dm btree remove: fix a bug when rebalancing nodes after removal
	dm btree: fix leak of bufio-backed block in btree_split_beneath error path
	xhci: handle no ping response error properly
	xhci: Add spurious wakeup quirk for LynxPoint-LP controllers
	xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)
	module: Fix locking in symbol_put_addr()
	crypto: api - Only abort operations on fatal signal
	md/raid1: submit_bio_wait() returns 0 on success
	md/raid10: submit_bio_wait() returns 0 on success
	Revert "md: allow a partially recovered device to be hot-added to an array."
	mvsas: Fix NULL pointer dereference in mvs_slot_task_free
	IB/cm: Fix rb-tree duplicate free and use-after-free
	md/raid5: fix locking in handle_stripe_clean_event()
	serial: 8250_pci: Add support for 16 port Exar boards
	serial: 8250_pci: Add support for 12 port Exar boards
	vhost/scsi: potential memory corruption
	ext4: allocate entire range in zero range
	ext4: fix loss of delalloc extent info in ext4_zero_range()
	KEYS: Fix race between key destruction and finding a keyring by name
	KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring
	PCI: Add flag for devices that don't reset on D3hot->D0 transition
	PCI: Add dev_flags bit to access VPD through function 0
	PCI: Add VPD function 0 quirk for Intel Ethernet devices
	sched: Fix cpu_active_mask/cpu_online_mask race
	USB: usbtmc: add device quirk for Rigol DS6104
	client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set
	iommu/amd: Handle integer overflow in dma_ops_area_alloc
	s390/3270: redraw screen on unsolicited device end
	usb: chipidea: debug: add runtime pm for register access
	USB: symbolserial: Correct transferred data size
	usb: musb: cppi41: improve rx channel abort routine
	usb: musb: fix cppi channel teardown for isoch transfer
	HID: apple: Add support for the 2015 Macbook Pro
	HID: quirks: add QUIRK_NOGET for an other TPV touchscreen
	Input: psmouse - add small delay for IBM trackpoint pass-through mode
	Input: serio - fix blocking of parport
	Input: omap4-keypad - fix memory leak
	Input: zhenhua - ensure we have BITREVERSE
	[media] usbvision: fix locking error
	[media] v4l: vsp1: Fix VI6_DPR_ROUTE_FXA_MASK macro
	[media] v4l: vsp1: Fix VI6_DPR_ROUTE_FP_MASK macro
	[media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro
	[media] gscpa_m5602: use msecs_to_jiffies for conversions
	mfd: wm5110: Add register patch for rev E and above
	mptfusion: prevent some memory corruption
	audit: correctly record file names with different path name types
	audit: create private file name copies when auditing inodes
	irda: precedence bug in irlmp_seq_hb_idx()
	macvtap: unbreak receiving of gro skb with frag list
	ppp: fix pppoe_dev deletion condition in pppoe_release()
	RDS-TCP: Recover correctly from pskb_pull()/pksb_trim() failure in rds_tcp_data_recv
	net/mlx4: Copy/set only sizeof struct mlx4_eqe bytes
	stmmac: Correctly report PTP capabilities.
	ipmr: fix possible race resulting from improper usage of IP_INC_STATS_BH() in preemptible context.
	qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module
	net: avoid NULL deref in inet_ctl_sock_destroy()
	net: fix a race in dst_release()
	virtio-net: drop NETIF_F_FRAGLIST
	qmi_wwan: add Sierra Wireless MC74xx/EM74xx
	ipv6: gre: support SIT encapsulation
	sit: fix sit0 percpu double allocations
	sfc: push partner queue for skb->xmit_more
	ipv6: clean up dev_snmp6 proc entry when we fail to initialize inet6_dev
	ipv4: disable BH when changing ip local port range
	packet: race condition in packet_bind
	RDS: verify the underlying transport exists before creating a connection
	ARM: orion: Fix DSA platform device after mvmdio conversion
	KVM: x86: work around infinite loop in microcode when #AC is delivered
	KVM: x86: Use new is_noncanonical_address in _linearize
	ipv6: addrconf: validate new MTU before applying it
	Revert "net: Fix skb_set_peeked use-after-free bug"
	tools/net: Use include/uapi with __EXPORTED_HEADERS__
	packet: do skb_probe_transport_header when we actually have data
	packet: always probe for transport header
	packet: tpacket_snd(): fix signed/unsigned comparison
	packet: only allow extra vlan len on ethernet devices
	packet: infer protocol from ethernet header if unset
	packet: fix tpacket_snd max frame len
	sctp: translate host order to network order when setting a hmacid
	ip_tunnel: disable preemption when updating per-cpu tstats
	snmp: Remove duplicate OUTMCAST stat increment
	net: qmi_wwan: add XS Stick W100-2 from 4G Systems
	tcp: md5: fix lockdep annotation
	tcp: fix potential huge kmalloc() calls in TCP_REPAIR
	tcp: initialize tp->copied_seq in case of cross SYN connection
	net, scm: fix PaX detected msg_controllen overflow in scm_detach_fds
	net: ipmr: fix static mfc/dev leaks on table destruction
	net: ip6mr: fix static mfc/dev leaks on table destruction
	broadcom: fix PHY_ID_BCM5481 entry in the id table
	ipv6: distinguish frag queues by device for multicast and link-local packets
	ipv6: add complete rcu protection around np->opt
	net/neighbour: fix crash at dumping device-agnostic proxy entries
	ipv6: sctp: implement sctp_v6_destroy_sock()
	Linux 3.18.25

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