Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/Changes
between commit:
283e8ba2dfde ("MODSIGN: Change from CMS to PKCS#7 signing if the openssl is too old")
from Linus' tree and commit:
1c3a54e257f7 ("Documentation/Changes: Add bc in "Current Minimal Requirements" section")
from the jc_docs tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc Documentation/Changes
index f447f0516f07,268a849c4cc0..000000000000
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@@ -43,7 -43,8 +43,8 @@@ o udev 08
o grub 0.93 # grub --version || grub-install --version
o mcelog 0.6 # mcelog --version
o iptables 1.4.2 # iptables -V
-o openssl & libcrypto 1.0.1k # openssl version
+o openssl & libcrypto 1.0.0 # openssl version
+ o bc 1.06.95 # bc --version
Kernel compilation
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
