From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Benoit Lemarchand <benoit.lemarchand@gmail.com>
Subject: linux-next: manual merge of the jc_docs tree with Linus' tree
Date: Mon, 12 Oct 2015 13:38:10 +1100 [thread overview]
Message-ID: <20151012133810.325d7bc5@canb.auug.org.au> (raw)
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@canb.auug.org.au
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
next reply other threads:[~2015-10-12 2:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 2:38 Stephen Rothwell [this message]
2016-08-05 2:42 linux-next: manual merge of the jc_docs tree with Linus' tree Stephen Rothwell
2017-10-19 11:32 Mark Brown
2017-10-31 23:35 Stephen Rothwell
2019-05-09 0:44 Stephen Rothwell
2019-07-25 0:26 Stephen Rothwell
2020-03-02 23:25 Stephen Rothwell
2020-03-22 23:50 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151012133810.325d7bc5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benoit.lemarchand@gmail.com \
--cc=corbet@lwn.net \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).