diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2022-10-31 17:37:21 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-10-31 17:37:21 +1100 |
commit | f98b4d13717a58b15c00880d2ccd24972316b430 (patch) | |
tree | c3b50090ee3ef4b15b7874ae237d76710108674c /crypto/akcipher.c | |
parent | 65722736c3baf29e02e964a09e85c9ef71c48e8d (diff) | |
parent | 247f34f7b80357943234f93f247a1ae6b6c3a740 (diff) |
Merge tag 'v6.1-rc2' into fixes
Merge rc2 into our fixes branch, which was based on rc1 but wasn't
merged until rc3, so that for the remainder of the release our fixes
branch will be based on rc2 for the purposes of resolving conflicts with
other trees (if necessary).
Diffstat (limited to 'crypto/akcipher.c')
0 files changed, 0 insertions, 0 deletions