All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Mark A. Greer" <mgreer@animalcreek.com>,
	Herbert Xu <herbert@gondor.apana.org.au>
Subject: Re: linux-next: manual merge of the arm-soc tree with the crypto tree
Date: Mon, 14 Jan 2013 09:22:22 -0800	[thread overview]
Message-ID: <20130114172221.GU14149@atomide.com> (raw)
In-Reply-To: <20130114134908.094003722be0612c20574338@canb.auug.org.au>

* Stephen Rothwell <sfr@canb.auug.org.au> [130113 18:52]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/crypto/omap-sham.c between commit dfd061d5a8f5 ("crypto:
> omap-sham - Add code to use dmaengine API") from the crypto tree and
> commit a62a6e98c370 ("ARM: OMAP2+: Disable code that currently does not
> work with multiplaform") from the arm-soc tree.
> 
> I fixed it up (the former removed the include that the latter protected)
> and can carry the fix as necessary (no action is required).

Thanks, yes the crypto tree changes fixed up things so the changes
coming from arm-soc tree are not needed any longer.

Regards,

Tony

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the crypto tree
Date: Mon, 14 Jan 2013 09:22:22 -0800	[thread overview]
Message-ID: <20130114172221.GU14149@atomide.com> (raw)
In-Reply-To: <20130114134908.094003722be0612c20574338@canb.auug.org.au>

* Stephen Rothwell <sfr@canb.auug.org.au> [130113 18:52]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/crypto/omap-sham.c between commit dfd061d5a8f5 ("crypto:
> omap-sham - Add code to use dmaengine API") from the crypto tree and
> commit a62a6e98c370 ("ARM: OMAP2+: Disable code that currently does not
> work with multiplaform") from the arm-soc tree.
> 
> I fixed it up (the former removed the include that the latter protected)
> and can carry the fix as necessary (no action is required).

Thanks, yes the crypto tree changes fixed up things so the changes
coming from arm-soc tree are not needed any longer.

Regards,

Tony

WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Mark A. Greer" <mgreer@animalcreek.com>,
	Herbert Xu <herbert@gondor.hengli.com.au>
Subject: Re: linux-next: manual merge of the arm-soc tree with the crypto tree
Date: Mon, 14 Jan 2013 09:22:22 -0800	[thread overview]
Message-ID: <20130114172221.GU14149@atomide.com> (raw)
In-Reply-To: <20130114134908.094003722be0612c20574338@canb.auug.org.au>

* Stephen Rothwell <sfr@canb.auug.org.au> [130113 18:52]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/crypto/omap-sham.c between commit dfd061d5a8f5 ("crypto:
> omap-sham - Add code to use dmaengine API") from the crypto tree and
> commit a62a6e98c370 ("ARM: OMAP2+: Disable code that currently does not
> work with multiplaform") from the arm-soc tree.
> 
> I fixed it up (the former removed the include that the latter protected)
> and can carry the fix as necessary (no action is required).

Thanks, yes the crypto tree changes fixed up things so the changes
coming from arm-soc tree are not needed any longer.

Regards,

Tony

  reply	other threads:[~2013-01-14 17:22 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-14  2:49 linux-next: manual merge of the arm-soc tree with the crypto tree Stephen Rothwell
2013-01-14  2:49 ` Stephen Rothwell
2013-01-14  2:49 ` Stephen Rothwell
2013-01-14 17:22 ` Tony Lindgren [this message]
2013-01-14 17:22   ` Tony Lindgren
2013-01-14 17:22   ` Tony Lindgren
  -- strict thread matches above, loose matches on Subject: below --
2012-05-08  7:21 Stephen Rothwell
2012-05-08  7:21 ` Stephen Rothwell
2012-05-08  7:21 ` Stephen Rothwell
2012-05-08 10:00 ` Herbert Xu
2012-05-08 10:00   ` Herbert Xu
2012-05-08 10:00   ` Herbert Xu

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=20130114172221.GU14149@atomide.com \
    --to=tony@atomide.com \
    --cc=arnd@arndb.de \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mgreer@animalcreek.com \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    /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.