* linux-next: manual merge of the akpm-current tree with the tiny tree
@ 2014-11-10 8:59 Stephen Rothwell
2014-11-10 17:58 ` Josh Triplett
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-10 8:59 UTC (permalink / raw)
To: Andrew Morton, Josh Triplett
Cc: linux-next, linux-kernel, Marian Chereji, Catalina Mocanu
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the tiny tree
2014-11-10 8:59 linux-next: manual merge of the akpm-current tree with the tiny tree Stephen Rothwell
@ 2014-11-10 17:58 ` Josh Triplett
0 siblings, 0 replies; 2+ messages in thread
From: Josh Triplett @ 2014-11-10 17:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Marian Chereji, Catalina Mocanu
On Mon, Nov 10, 2014 at 07:59:12PM +1100, Stephen Rothwell wrote:
> 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).
Looks good.
- Josh Triplett
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-10 17:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-10 8:59 linux-next: manual merge of the akpm-current tree with the tiny tree Stephen Rothwell
2014-11-10 17:58 ` Josh Triplett
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).