Merge tag 'LA.UM.6.4.r1-10300-8x98.0' into kernel.lnx.4.4.r27-rel

"LA.UM.6.4.r1-10300-8x98.0"

* tag 'LA.UM.6.4.r1-10300-8x98.0':
  icnss: Remove sending uevent after FW ready
  input: touchscreen: synaptics_dsx: Fix buffer overflow
  ASoC: msm: Fix config control indices for TX DAIs
  msm: ipa: rmnet: Make code changes with respect to CR#2046006
  net: sockev: fix uninitialized data leak into userspace
  ARM: dts: msm: Untrusted pointer dereference
  diag: Update mask pointers after reallocation
  ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr
  taskstats: fix the length of cgroupstats_cmd_get_policy
  hid: usbhid: Changes to prevent buffer overflow
  udp: consistently apply ufo or fragmentation
  netfilter: add back stackpointer size checks
  UPSTREAM: scsi: sg: don't return bogus Sg_requests
  ANDROID: sdcardfs: Use lower getattr times/size
  ion: invalidate the pool pointers after free
  KEYS: fix out-of-bounds read during ASN.1 parsing

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	net/ipv4/ip_output.c
	net/ipv6/ip6_output.c