K 10 svn:author V 8 rmacklem K 8 svn:date V 27 2020-07-25T02:55:33.194826Z K 7 svn:log V 108 The merge resulted in two ktls_ocf_tls12_gcm_decrypt() functions. Delete the one not in ktls_ocf.c in head. END