Merge android-4.14 (48a0bb1a) into msm-4.14
* refs/heads/tmp-48a0bb1a: Revert "tcp: free batches of packets in tcp_prune_ofo_queue()" Revert "f2fs: give message and set need_fsck given broken node id" ANDROID: sdcardfs: Check stacked filesystem depth ANDROID: keychord: Check for write data size ANDROID: verity: really fix android-verity Kconfig tcp: add tcp_ooo_try_coalesce() helper tcp: call tcp_drop() from tcp_data_queue_ofo() tcp: detect malicious patterns in tcp_collapse_ofo_queue() tcp: avoid collapses in tcp_prune_queue() if possible tcp: free batches of packets in tcp_prune_ofo_queue() Change-Id: I4bb3069ba090f18bd109d7e27b424bca6609182c Signed-off-by:Blagovest Kolenichev <bkolenichev@codeaurora.org>
Loading
Please register or sign in to comment