From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Michael Neuling <mikey@neuling.org>
Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Kent Yoder <key@linux.vnet.ibm.com>,
anton@samba.org, Herbert Xu <herbert@gondor.hengli.com.au>
Subject: Re: CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31)
Date: Wed, 01 Aug 2012 08:15:51 +1000 [thread overview]
Message-ID: <1343772951.16975.18.camel@pasglop> (raw)
In-Reply-To: <19970.1343772018@neuling.org>
On Wed, 2012-08-01 at 08:00 +1000, Michael Neuling wrote:
>
> OK. Please post the fix as a patch. Anton's patch is already in the
> powerpc next tree so it won't be changed/rebased directly.
>
> I'm not sure who can carry this, since the crypto tree doesn't have
> Anton's change and the powerpc tree doesn't have Seth's change.
>
> sfr: who normally carries it when we have a merge issue like this?
> You?
There is no powerpc -next tree at this point, Anton patch is either
upstream or in no tree.
Cheers,
Ben.
next prev parent reply other threads:[~2012-07-31 22:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 5:26 linux-next: Tree for July 31 Stephen Rothwell
2012-07-31 5:58 ` CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31) Michael Neuling
2012-07-31 5:58 ` Michael Neuling
2012-07-31 13:30 ` Seth Jennings
2012-07-31 13:30 ` Seth Jennings
2012-07-31 22:00 ` Michael Neuling
2012-07-31 22:00 ` Michael Neuling
2012-07-31 22:08 ` Michael Neuling
2012-07-31 22:08 ` Michael Neuling
2012-07-31 22:15 ` Benjamin Herrenschmidt [this message]
2012-07-31 17:22 ` linux-next: Tree for July 31 (media/radio-tea5777) Randy Dunlap
2012-07-31 19:56 ` Mauro Carvalho Chehab
2012-07-31 20:15 ` Randy Dunlap
2012-08-01 8:22 ` Hans de Goede
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=1343772951.16975.18.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=anton@samba.org \
--cc=herbert@gondor.hengli.com.au \
--cc=key@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mikey@neuling.org \
--cc=sfr@canb.auug.org.au \
--cc=sjenning@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.