From: Kevin Hilman <khilman@deeprootsystems.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the davinci tree with the arm tree
Date: Fri, 29 Jan 2010 15:33:29 -0800 [thread overview]
Message-ID: <87iqakpjue.fsf@deeprootsystems.com> (raw)
In-Reply-To: <20100129111342.203358d9.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Fri\, 29 Jan 2010 11\:13\:42 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflict in
> arch/arm/mach-bcmring/core.c between commit
> dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate
> clks_register() and similar") from the arm tree and commit
> 25c692215f5dfc4992b11c4fb57538d1139d6636 ("Consolidate clks_register()
> and similar") from the davinci tree.
>
> The davinci tree version has a typo (ARRAY_SIEZ v. ARRAY_SIZE) so I used
> the arm tree version.
OK, I'll drop the one from the davinci tree.
Thanks,
Kevin
next prev parent reply other threads:[~2010-01-29 23:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-29 0:13 linux-next: manual merge of the davinci tree with the arm tree Stephen Rothwell
2010-01-29 23:33 ` Kevin Hilman [this message]
2010-01-30 1:26 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-05-19 1:10 Stephen Rothwell
2010-10-17 23:31 Stephen Rothwell
2010-10-18 0:01 ` Stephen Rothwell
2010-10-19 15:46 ` Kevin Hilman
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=87iqakpjue.fsf@deeprootsystems.com \
--to=khilman@deeprootsystems.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--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).