Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE.""
Merge "Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE."""
Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE.""
Merge "Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE."""
Merge "Merge "net: rmnet_usb: Add support for aligned QOS header""
Merge "Merge "Merge "net: rmnet_usb: Add support for aligned QOS header"""
Revert "inet: prevent leakage of uninitialized memory to user in recv syscalls"

This reverts commit 11afb94fbe0337a06ee7fce36841969b4e538622.
Revert "inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions"

This reverts commit ad25b5df02bacf27efb56fe12bb8da8dd9273546.
Revert "Revert "net: ipv6: Add IPv6 support to the ping socket.""

This reverts commit ce9e56961ad6ab663b49b0ee5c213a62097ebcf8.
Revert "Revert "ping: always initialize ->sin6_scope_id and ->sin6_flowinfo""

This reverts commit a7cb95c01e34c8d27d837b3071a56ebc20f8df6b.
Merge remote-tracking branch 'caf/kk_2.7.1' into cm-11.0