Merge 3.18.47 into android-3.18

Changes in 3.18.47:
	usb: gadget: composite: correctly initialize ep->maxpacket
	drm/gma500: Add compat ioctl
	scsi: megaraid_sas: For SRIOV enabled firmware, ensure VF driver waits for 30secs before reset
	PCI: Check for PME in targeted sleep state
	USB: UHCI: report non-PME wakeup signalling for Intel hardware
	regulator: stw481x-vmmc: fix ages old enable error
	crypto: caam - fix AEAD givenc descriptors
	ext4: fix mballoc breakage with 64k block size
	ext4: fix stack memory corruption with 64k block size
	staging: comedi: ni_mio_common: fix M Series ni_ai_insn_read() data mask
	ssb: Fix error routine when fallback SPROM fails
	usb: hub: Fix auto-remount of safely removed or ejected USB-3 devices
	ext4: sanity check the block and cluster size at mount time
	ext4: use more strict checks for inodes_per_block on mount
	ext4: add sanity checking to count_overhead()
	KVM: PPC: Book3S HV: Save/restore XER in checkpointed register state
	dm crypt: mark key as invalid until properly loaded
	ALSA: hda - fix headset-mic problem on a Dell laptop
	f2fs: set ->owner for debugfs status file's file_operations
	md/raid5: limit request size according to implementation limits
	thermal: hwmon: Properly report critical temperature in sysfs
	USB: serial: kl5kusb105: fix open error path
	powerpc/ps3: Fix system hang with GCC 5 builds
	Btrfs: fix tree search logic when replaying directory entry deletes
	block: protect iterate_bdevs() against concurrent close
	xfs: set AGI buffer type in xlog_recover_clear_agi_bucket
	ALSA: usb-audio: Fix race at stopping the stream
	mmc: sdhci: Fix recovery from tuning timeout
	USB: cdc-acm: add device id for GW Instek AFG-125
	CIFS: Fix missing nls unload in smb2_reconnect()
	CIFS: Fix a possible memory corruption in push locks
	CIFS: Fix a possible memory corruption during reconnect
	drm/radeon: add additional pci revision to dpm workaround
	arm/xen: Use alloc_percpu rather than __alloc_percpu
	dm space map metadata: fix 'struct sm_metadata' leak on failed create
	ALSA: usb-audio: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks
	USB: serial: option: add support for Telit LE922A PIDs 0x1040, 0x1041
	USB: serial: option: add dlink dwm-158
	fgraph: Handle a case where a tracer ignores set_graph_notrace
	nfs_write_end(): fix handling of short copies
	ext4: return -ENOMEM instead of success
	SUNRPC: fix refcounting problems with auth_gss messages.
	kconfig/nconf: Fix hang when editing symbol with a long prompt
	s390/vmlogrdr: fix IUCV buffer allocation
	ALSA: hiface: Fix M2Tech hiFace driver sampling rate change
	libceph: verify authorize reply on connect
	Input: drv260x - fix input device's parent assignment
	block_dev: don't test bdev->bd_contains when it is not stable
	IPoIB: Avoid reading an uninitialized member variable
	scsi: avoid a permanent stop of the scsi device's request queue
	target/user: Fix use-after-free of tcmu_cmds if they are expired
	drivers/gpu/drm/ast: Fix infinite loop if read fails
	Revert "ALSA: usb-audio: Fix race at stopping the stream"
	IB/cma: Fix a race condition in iboe_addr_get_sgid()
	fs: exec: apply CLOEXEC before changing dumpable task flags
	sg_write()/bsg_write() is not fit to be called under KERNEL_DS
	ipip: Properly mark ipip GRO packets as encapsulated.
	net: ipv4: Convert IP network timestamps to be y2038 safe
	net: Use more bit fields in napi_gro_cb
	tunnels: Don't apply GRO to multiple layers of encapsulation.
	gro: Allow tunnel stacking in the case of FOU/GUE
	Linux 3.18.47

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