diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-21 13:43:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-21 13:43:04 +1100 |
| commit | f755d2d69d0447948260c47703201b4854f083cd (patch) | |
| tree | 5c1ab4cfeba7e10fb70421bc5688e91c7c59173d /Documentation | |
| parent | db3f60312898326c5a7909408066bb0221830870 (diff) | |
| parent | 2509671dcf6314635592f8eb84ef4793fce11a07 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/hfsplus.txt | 2 | ||||
| -rw-r--r-- | Documentation/module-signing.txt | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/filesystems/hfsplus.txt b/Documentation/filesystems/hfsplus.txt index af1628a1061c..59f7569fc9ed 100644 --- a/Documentation/filesystems/hfsplus.txt +++ b/Documentation/filesystems/hfsplus.txt @@ -56,4 +56,4 @@ References kernel source: <file:fs/hfsplus> -Apple Technote 1150 http://developer.apple.com/technotes/tn/tn1150.html +Apple Technote 1150 https://developer.apple.com/legacy/library/technotes/tn/tn1150.html diff --git a/Documentation/module-signing.txt b/Documentation/module-signing.txt index b6af42e4d790..356418efcd8d 100644 --- a/Documentation/module-signing.txt +++ b/Documentation/module-signing.txt @@ -78,11 +78,11 @@ This has a number of options available: This presents a choice of which hash algorithm the installation phase will sign the modules with: - CONFIG_SIG_SHA1 "Sign modules with SHA-1" - CONFIG_SIG_SHA224 "Sign modules with SHA-224" - CONFIG_SIG_SHA256 "Sign modules with SHA-256" - CONFIG_SIG_SHA384 "Sign modules with SHA-384" - CONFIG_SIG_SHA512 "Sign modules with SHA-512" + CONFIG_MODULE_SIG_SHA1 "Sign modules with SHA-1" + CONFIG_MODULE_SIG_SHA224 "Sign modules with SHA-224" + CONFIG_MODULE_SIG_SHA256 "Sign modules with SHA-256" + CONFIG_MODULE_SIG_SHA384 "Sign modules with SHA-384" + CONFIG_MODULE_SIG_SHA512 "Sign modules with SHA-512" The algorithm selected here will also be built into the kernel (rather than being a module) so that modules signed with that algorithm can have |