* sm8250/lineage-20:
msm: camera: Fix isp_vma_fault function signature
msm: ipa2: Fix ipa_nat_vma_fault_remap function signature
UPSTREAM: ipv4: Fix NULL pointer dereference in ipv4_neigh_lookup()
UPSTREAM: ipv4: remove sparse error in ip_neigh_gw4()
UPSTREAM: net: ipv4: Fix NULL pointer dereference in route lookup
BACKPORT: gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst()
UPSTREAM: net: add missing READ_ONCE(sk->sk_rcvbuf) annotation
UPSTREAM: bpf: Sockmap/tls, fix pop data with SK_DROP return code
UPSTREAM: bpf: net: Set sk_bpf_storage back to NULL for cloned sk
UPSTREAM: net: set SOCK_RCU_FREE before inserting socket into hashtable
UPSTREAM: bpf: Fix bpf socket lookup from tc/xdp to respect socket VRF bindings
UPSTREAM: udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port().
BACKPORT: apparmor: Use pointer to struct aa_label for lbs_cred
BACKPORT: lockdown: Allow unprivileged users to see lockdown status
BACKPORT: LSM: add SafeSetID module that gates setid calls
UPSTREAM: LSM: fix return value check in safesetid_init_securityfs()
UPSTREAM: security, lsm: dentry_init_security() Handle multi LSM registration
BACKPORT: lsm: fix default return value of the socket_getpeersec_*() hooks
BACKPORT: lsm: make security_socket_getpeersec_stream() sockptr_t safe
UPSTREAM: lsm: fix default return value for vm_enough_memory
...
Conflicts:
Makefile
drivers/usb/dwc3/gadget.c
fs/sdcardfs/main.c
include/linux/mmzone.h
include/linux/proc_fs.h
kernel/Makefile
kernel/fork.c
kernel/sysctl.c
mm/memory.c
mm/util.c
net/ipv4/tcp_output.c
net/ipv6/route.c
Change-Id: Ie7e1c5a7e84131a96b1dc70cf89964ce33d6e4f5
e66792c5fd