From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Josh Triplett <josh@joshtriplett•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Marian Chereji <marian.chereji@freescale•com>,
Catalina Mocanu <catalina.mocanu@gmail•com>
Subject: linux-next: manual merge of the akpm-current tree with the tiny tree
Date: Mon, 10 Nov 2014 19:59:12 +1100 [thread overview]
Message-ID: <20141110195912.324b90ed@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
lib/Kconfig between commit 3a8aeefbd4e9 ("lib: halfmd4: Make halfmd4.c
optional") from the tiny tree and commit c7f379b518a3 ("lib: Add CRC64
ECMA module") from the akpm-current 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 lib/Kconfig
index b8c97f05140d,2faf7b2de5b3..000000000000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -186,9 -180,13 +186,16 @@@ config CRC
when they need to do cyclic redundancy check according CRC8
algorithm. Module will be called crc8.
+ config CRC64_ECMA
+ tristate "CRC64 ECMA function"
+ help
+ This option provides CRC64 ECMA function. Drivers may select this
+ when they need to do cyclic redundancy check according to the CRC64
+ ECMA algorithm.
+
+config HALFMD4
+ bool
+
config AUDIT_GENERIC
bool
depends on AUDIT && !AUDIT_ARCH
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-10 8:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 8:59 Stephen Rothwell [this message]
2014-11-10 17:58 ` linux-next: manual merge of the akpm-current tree with the tiny tree Josh Triplett
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=20141110195912.324b90ed@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=catalina.mocanu@gmail$(echo .)com \
--cc=josh@joshtriplett$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marian.chereji@freescale$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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