Merge 3.18.26 into android-3.18

Changes in 3.18.26:
	gre6: allow to update all parameters via rtnl
	atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation
	sctp: use the same clock as if sock source timestamps were on
	sctp: update the netstamp_needed counter when copying sockets
	sctp: also copy sk_tsflags when copying the socket
	net: qca_spi: fix transmit queue timeout handling
	ipv6: sctp: clone options to avoid use after free
	net: add validation for the socket syscall protocol argument
	sh_eth: fix kernel oops in skb_put()
	net: fix IP early demux races
	vlan: Fix untag operations of stacked vlans with REORDER_HEADER off
	skbuff: Fix offset error in skb_reorder_vlan_header
	pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
	bluetooth: Validate socket address length in sco_sock_bind().
	fou: clean up socket with kfree_rcu
	af_unix: Revert 'lock_interruptible' in stream receive code
	unix: avoid use-after-free in ep_remove_wait_queue
	RDS: fix race condition when sending a message on unbound socket
	Btrfs: fix file corruption and data loss after cloning inline extents
	Btrfs: fix race leading to incorrect item deletion when dropping extents
	Btrfs: fix race leading to BUG_ON when running delalloc for nodatacow
	Btrfs: fix race when listing an inode's xattrs
	rbd: don't put snap_context twice in rbd_queue_workfn()
	ext4, jbd2: ensure entering into panic after recording an error in superblock
	firewire: ohci: fix JMicron JMB38x IT context discovery
	nfsd: serialize state seqid morphing operations
	nfs4: start callback_ident at idr 1
	nfs: if we have no valid attrs, then don't declare the attribute cache valid
	ocfs2: fix umask ignored issue
	ceph: fix message length computation
	ALSA: hda/hdmi - apply Skylake fix-ups to Broxton display codec
	iwlwifi: 7000: fix reported firmware name for 7265D
	iwlwifi: bump firmware API for mvm devices to 12
	RDS: verify the underlying transport exists before creating a connection
	rbd: don't leak parent_spec in rbd_dev_probe_parent()
	USB: cdc_acm: Ignore Infineon Flash Loader utility
	USB: serial: Another Infineon flash loader USB ID
	USB: cp210x: Remove CP2110 ID from compatibility list
	USB: add quirk for devices with broken LPM
	USB: whci-hcd: add check for dma mapping error
	usb: gadget: pxa27x: fix suspend callback
	usb: musb: USB_TI_CPPI41_DMA requires dmaengine support
	usb: core : hub: Fix BOS 'NULL pointer' kernel panic
	usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message
	net: check both type and procotol for tcp sockets
	KEYS: Fix race between read and revoke
	KEYS: Fix keyring ref leak in join_session_keyring()
	Revert "workqueue: make sure delayed work run in local cpu"
	Linux 3.18.26

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