lkml.org 
[lkml]   [2014]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm-current tree with the tiny tree
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




\
 
 \ /
  Last update: 2014-11-10 19:41    [W:0.030 / U:5.948 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site