OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1ff4e8
e1f3219
)
Merge branch 'TIPC-Encryption'
author
David S. Miller
<davem@davemloft.net>
Fri, 8 Nov 2019 22:01:59 +0000
(14:01 -0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 8 Nov 2019 22:01:59 +0000
(14:01 -0800)
Tuong Lien says:
====================
TIPC Encryption
This series provides TIPC encryption feature, kernel part. There will be
another one in the 'iproute2/tipc' for user space to set key.
v2: add select crypto 'aes(gcm)' for TIPC_CRYPTO in Kconfig
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge