diff options
| author | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
| commit | b4da00601edd39184fa187d5fd6dfc36232991cc (patch) | |
| tree | f58bafde4efd814bb78b4f531b1eab48dcf8e561 /kernel/Makefile | |
| parent | d5a7d45fb5b667fd10a225ccf11fe395fb2417d9 (diff) | |
| parent | 5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff) | |
Merge 4.1-rc2 into staging-next
We want the fixes in here to make merges and testing easier.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 0f8f8b0bc1bf..60c302cfb4d3 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -197,9 +197,9 @@ x509.genkey: @echo >>x509.genkey "x509_extensions = myexts" @echo >>x509.genkey @echo >>x509.genkey "[ req_distinguished_name ]" - @echo >>x509.genkey "O = Magrathea" - @echo >>x509.genkey "CN = Glacier signing key" - @echo >>x509.genkey "emailAddress = [email protected]" + @echo >>x509.genkey "#O = Unspecified company" + @echo >>x509.genkey "CN = Build time autogenerated kernel key" + @echo >>x509.genkey "#emailAddress = [email protected]" @echo >>x509.genkey @echo >>x509.genkey "[ myexts ]" @echo >>x509.genkey "basicConstraints=critical,CA:FALSE" |