[lkml]   [2013]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the security tree with the tree
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

 \ /
  Last update: 2013-10-29 10:01    [W:0.051 / U:2.464 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site