projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d153a0e
055d9ee
)
Merge branch 'CR_2285_SEC_jiajie.ho' into 'jh7110-5.15.y-devel'
author
andy.hu
<andy.hu@starfivetech.com>
Fri, 14 Oct 2022 07:34:12 +0000
(07:34 +0000)
committer
andy.hu
<andy.hu@starfivetech.com>
Fri, 14 Oct 2022 07:34:12 +0000
(07:34 +0000)
Cr 2285 sec jiajie.ho
See merge request sdk/linux!533
1
2
arch/riscv/boot/dts/starfive/jh7110.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
drivers/crypto/starfive/jh7110/jh7110-aes.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/crypto/starfive/jh7110/jh7110-sha.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/riscv/boot/dts/starfive/jh7110.dtsi
index 21af51def983d9ffbdd7a0ed7772e35f1c7cb302,55f2d0cdc2e6dec7151368b1e52d5abb465f8c09..99db7b0cafd4695daec35b57d5ebf14e081cb8f4
mode 100644,100755..100644
---
1
/
arch/riscv/boot/dts/starfive/jh7110.dtsi
---
2
/
arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/
arch/riscv/boot/dts/starfive/jh7110.dtsi
diff --cc
drivers/crypto/starfive/jh7110/jh7110-aes.c
Simple merge
diff --cc
drivers/crypto/starfive/jh7110/jh7110-sha.c
Simple merge
projects / platform / kernel / linux-starfive.git / commitdiff