Conflicts: drivers/soc/qcom/qmi_rmnet.c drivers/spi/spi-geni-qcom.c drivers/usb/gadget/function/f_hid.c fs/crypto/keysetup_v1.c include/net/cfg80211.h Bug: 223958127 Signed-off-by: JohnnLee <johnnlee@google.com> Change-Id: Ib6e435748a2478f760957d66b0db24636191837f