Am Dienstag, 1. August 2017, 11:08:33 CEST schrieb Herbert Xu: Hi Herbert, > > How about you separate into three patches? The first two make > changes to algif_skcipher/algif_aead so that they can be merged, > and the last one does the actual merging. > Ok, I can do that. How would you want to handle the following: the new af_alg_wait_for_data will include: if (sk_wait_event(sk, &timeout, (ctx->used || !ctx->more) whereas algif_aead only contains !ctx->more and algif_skcipher only contains ctx->used in the check? When merging both, having the common check is good for both, but not needed individually. Shall I only make the change during the merger or add these changes to the modification of algif_skcipher/algif_aead? Please then also disregard the recvmsg consolidation patch from this morning. Ciao Stephan