Re: linux-next: manual merge of the security tree with the tree

From: Dmitry Kasatkin
Date: Tue Oct 29 2013 - 04:37:40 EST

On 28/10/13 09:47, Stephen Rothwell wrote:
> Hi James,
> Today's linux-next merge of the security tree got a conflict in
> crypto/Makefile between commit a62b01cd6cc1 ("crypto: create generic
> version of ablk_helper") from the crypto tree and commit ee08997fee16
> ("crypto: provide single place for hash algo information") from the
> security tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).


- Dmitry

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at