tree 6e3d24210dd0aea524d3032ee81518fd751c6f1f
parent d5121ea166edbe8c61cc91f4d9323e635d536929
parent ac35b66883e8330ffde609152e13c225b12de6a4
author Greg Kroah-Hartman <gregkh@google.com> 1531317931 +0200
committer Greg Kroah-Hartman <gregkh@google.com> 1531317931 +0200
mergetag object ac35b66883e8330ffde609152e13c225b12de6a4
 type commit
 tag v3.18.115
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1531316547 +0200
 
 This is the 3.18.115 stable release
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAltGCUMACgkQONu9yGCS
 aT5Bkw/9EvXyHxsCmazLPiqEi4HJA1T+VxdDQU+1lmHd4X17ugaXLSmb9OTXZdA0
 x7dfYF8QWSW7uNDhOhOICWSJi7iLVlB4fb2EHMzro2QCtn6yDTxCgzpIC699DK6M
 4I3iXnVRBTqB9SHiTCOzH9Wnlqdqql9dmgxKsSsrKnSW5zfJz0xXwIh//Q4A66EU
 eFMLnIWhmWClPTKxA09hyUEKKT2aa2/NcgCe+y/9ccRE/PHJ05XyZHJAn0CHZLAv
 h//CuyIuHyJdacYnxOPI4dRtwTpBe1xJq6pF2KngM/NTBo1QwemqsNEydS6GE1s/
 /Kgj6fWZ7G6M0mL2F5J3FKa3lbvAWSK2shFBGiqaiwsroOWlwZClIoxSkdK9UsAz
 rWPss+yMqlnQpEQvcGjBXYqjiaeAJ+RGxP2GJ1yUoXbfYxbyi8hdLmDeu0mpFRZt
 DnyRVOCwzppeEH0ECXoeEpwRqxbP/XFiR7PBwP9rb64u7TJQ0/Pzt2dljgB5sDs4
 y6LkcSeCkmGJBToPckhwcYU6feowtCB4PsKWOlWOGe4Qz/riDAHDaM6Kb4HLrdJj
 S9091uWzASF6foZU7w50Z/lpGMBqlGP2ZD1zJwqHYVmSX+rr21FblFM57stIK52a
 m+xA/yUW833ePEI5qXyue5BVvwJ1BCVTe3ZhyGUjffM33j32ZC4=
 =fzZ0
 -----END PGP SIGNATURE-----

Merge 3.18.115 into android-3.18

Changes in 3.18.115
	n_tty: Fix stall at n_tty_receive_char_special().
	staging: android: ion: Return an ERR_PTR in ion_map_kernel
	x86/boot: Fix early command-line parsing when matching at end
	ubi: fastmap: Correctly handle interrupted erasures in EBA
	netfilter: ebtables: handle string from userspace with care
	atm: zatm: fix memcmp casting
	net: qmi_wwan: Add Netgear Aircard 779S
	net/sonic: Use dma_mapping_error()
	scsi: sg: mitigate read/write abuse
	cifs: Fix infinite loop when using hard mount option
	ext4: make sure bitmaps and the inode table don't overlap with bg descriptors
	ext4: clear i_data in ext4_inode_info when removing inline data
	ext4: add more mount time checks of the superblock
	HID: i2c-hid: Fix "incomplete report" noise
	HID: debug: check length before copy_to_user()
	media: cx25840: Use subdev host data for PLL override
	dm bufio: avoid sleeping while holding the dm_bufio lock
	dm bufio: drop the lock when doing GFP_NOIO allocation
	mtd: rawnand: mxc: set spare area size register explicitly
	mtd: cfi_cmdset_0002: Change definition naming to retry write operation
	mtd: cfi_cmdset_0002: Change erase functions to retry for error
	mtd: cfi_cmdset_0002: Change erase functions to check chip good only
	netfilter: nf_log: don't hold nf_log_mutex during user access
	Linux 3.18.115

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