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

Commit 079b43b8 authored by kamasali Satyanarayan's avatar kamasali Satyanarayan Committed by Kamasali Satyanarayan
Browse files

Merge android11-5.4.259+ (70db018a) into msm-5.4



* remotes/origin/tmp-70db018a:
  UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
  ANDROID: Snapshot Mainline's version of checkpatch.pl
  UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup
  UPSTREAM: nvmet-tcp: move send/recv error handling in the send/recv methods instead of call-sites

Conflicts:
	scripts/checkpatch.pl

Change-Id: I28aaacd0fb6478ade935672027760efce65a7911
Signed-off-by: default avatarkamasali Satyanarayan <quic_kamasali@quicinc.com>
parents bd73268e 70db018a
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