archive mirror
 help / color / mirror / Atom feed
From: Dmitry Kasatkin <>
To: Stephen Rothwell <>,
	James Morris <>
	Mimi Zohar <>,
	Ard Biesheuvel <>,
	Herbert Xu <>
Subject: Re: linux-next: manual merge of the security tree with the  tree
Date: Tue, 29 Oct 2013 10:37:05 +0200	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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

      reply	other threads:[~2013-10-29  8:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-28  7:47 linux-next: manual merge of the security tree with the tree Stephen Rothwell
2013-10-29  8:37 ` Dmitry Kasatkin [this message]

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).