All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Kasatkin <d.kasatkin@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	James Morris <jmorris@namei.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mimi Zohar <zohar@linux.vnet.ibm.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Herbert Xu <herbert@gondor.apana.org.au>
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: <526F73B1.6030607@samsung.com> (raw)
In-Reply-To: <20131028184740.ee58871cc5bd149901cbdf03@canb.auug.org.au>

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).
>
Hello,

Thanks!

- Dmitry

WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Kasatkin <d.kasatkin@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	James Morris <jmorris@namei.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mimi Zohar <zohar@linux.vnet.ibm.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Herbert Xu <herbert@gondor.hengli.com.au>
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: <526F73B1.6030607@samsung.com> (raw)
In-Reply-To: <20131028184740.ee58871cc5bd149901cbdf03@canb.auug.org.au>

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).
>
Hello,

Thanks!

- Dmitry


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

Thread overview: 4+ 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-28  7:47 ` Stephen Rothwell
2013-10-29  8:37 ` Dmitry Kasatkin [this message]
2013-10-29  8:37   ` Dmitry Kasatkin

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=526F73B1.6030607@samsung.com \
    --to=d.kasatkin@samsung.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=jmorris@namei.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=zohar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.