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,
Sekhar Nori <nsekhar@ti.com>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Russell King <rmk+lkml@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the davinci tree with the arm tree
Date: Tue, 19 Oct 2010 08:46:41 -0700 [thread overview]
Message-ID: <87k4le18ym.fsf@deeprootsystems.com> (raw)
In-Reply-To: <20101018103152.33fa12cd.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 18 Oct 2010 10:31:52 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflicts in
> arch/arm/mach-davinci/board-da830-evm.c and
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> 48ea89eabee96019a4a84615af921f8703320abb ("davinci: introduce support for
> AM1x ARM9 microprocessors") from the davinci tree.
>
> Just context changes, I fixed them up (see below) and can carry the fix
> as necessary.
Hi Stephen,
Thanks for carrying this.
Russell has (temporarily) dropped his version of the patch, but when he
adds it back (today, I believe) I will fix this up in the davinci tree
by pre-merging his branch with mine to handle this conflict.
Kevin
next prev parent reply other threads:[~2010-10-19 15:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-17 23:31 linux-next: manual merge of the davinci tree with the arm tree Stephen Rothwell
2010-10-18 0:01 ` Stephen Rothwell
2010-10-19 15:46 ` Kevin Hilman [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-19 1:10 Stephen Rothwell
2010-01-29 0:13 Stephen Rothwell
2010-01-29 23:33 ` Kevin Hilman
2010-01-30 1:26 ` Stephen Rothwell
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=87k4le18ym.fsf@deeprootsystems.com \
--to=khilman@deeprootsystems.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=nsekhar@ti.com \
--cc=rmk+lkml@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