linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Andreas Westin <andreas.westin@stericsson.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Lee Jones <lee.jones@linaro.org>
Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree
Date: Mon, 7 May 2012 08:09:21 +0000	[thread overview]
Message-ID: <201205070809.21709.arnd@arndb.de> (raw)
In-Reply-To: <20120507121137.bdfc96ed31649040506d9c75@canb.auug.org.au>

On Monday 07 May 2012, Stephen Rothwell wrote:
> + static void __init u8500_cryp1_hash1_init(void)
> + {
> +       db8500_add_cryp1(&u8500_cryp1_platform_data);
> +       db8500_add_hash1(&u8500_hash1_platform_data);
> + }

This is actually not correct any more because of the
other changes: each device addition should also pass the parent
pointer so the device is created in the right position.

Stephen, your fix is ok for linux-next and I expect everything
to still work, but we should not merge it into v3.5 this way.

Thanks for the fixup.

	Arnd

  parent reply	other threads:[~2012-05-07  8:57 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-07  2:11 linux-next: manual merge of the crypto tree with Linus' tree Stephen Rothwell
2012-05-07  4:16 ` Herbert Xu
2012-05-07  8:09 ` Arnd Bergmann [this message]
2012-05-07  9:04   ` Herbert Xu
2012-05-07 11:02     ` Linus Walleij
  -- strict thread matches above, loose matches on Subject: below --
2023-06-26  1:52 Stephen Rothwell
2021-06-15  1:39 Stephen Rothwell
2020-09-21  2:36 Stephen Rothwell
2020-05-11  3:23 Stephen Rothwell
2019-11-05  2:23 Stephen Rothwell
2019-08-23  3:08 Stephen Rothwell
2019-08-23  3:25 ` Nick Desaulniers
2019-06-11  2:07 Stephen Rothwell
2019-06-03  0:52 Stephen Rothwell
2014-05-09  2:07 Stephen Rothwell
2014-05-09 12:51 ` Herbert Xu
2014-04-17  2:57 Stephen Rothwell
2014-04-17  2:49 Stephen Rothwell
2012-05-07  2:31 Stephen Rothwell
2012-05-07  4:20 ` Herbert Xu
2010-04-14  1:48 Stephen Rothwell
2010-04-14  3:14 ` 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=201205070809.21709.arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=andreas.westin@stericsson.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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 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).