Merge the crypto tree to resolve the conflict between the temporary and long-term fixes in algif_skcipher.