Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d1f52d84 authored by Nathan Chancellor's avatar Nathan Chancellor
Browse files

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



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

* tag 'LA.UM.6.4.r1-09000-8x98.0':
  ANDROID: sdcardfs: Use lower getattr times/size
  msm: ipa: fix to not allow NAT DMA command without device initialization
  ipv6: ip6_make_skb() needs to clear cork.base.dst
  ipv6: fix possible mem leaks in ipv6_make_skb()
  ARM: dts: msm: Add support for truly FHD panel on SDM660 CDP
  msm: kgsl: Don't dump GPMU registers on non GPMU devices
  qcom: qpnp-haptics: extend stop timer for a longer request
  ARM: dts: msm: add support FULL HD Display for SDM660
  ARM: dts: msm: Add speed-bin 4 support for sdm660
  regulator: cprh-kbss: Add speed-bin 4 support for sdm660
  drm/msm : check buffer size before writing to user buffer
  ARM: dts: msm: Add support for new speed bin for SDM660
  ASoC: msm: check payload size before memory allocation
  crypto: hmac - require that the underlying hash algorithm is unkeyed

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

Conflicts:
	include/crypto/internal/hash.h
	net/ipv6/ip6_output.c
parents fea4b298 ea1f49b0
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment