From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Walker <dwalker@codeaurora•org>
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 msm tree with the arm tree
Date: Wed, 5 May 2010 07:26:45 +1000 [thread overview]
Message-ID: <20100505072645.abdee42d.sfr@canb.auug.org.au> (raw)
In-Reply-To: <1272991333.4813.1.camel@c-dwalke-linux.qualcomm.com>
[-- Attachment #1: Type: text/plain, Size: 983 bytes --]
Hi Daniel,
On Tue, 04 May 2010 09:42:13 -0700 Daniel Walker <dwalker@codeaurora•org> wrote:
>
> On Tue, 2010-05-04 at 11:07 +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the msm tree got a conflict in
> > arch/arm/mach-msm/Kconfig between commit
> > 4b53eb4f5d78416456bb969ce30e3bed2731d744 ("arm: msm: allow ARCH_MSM to
> > have v7 cpus") from the arm tree and commit
> > e17047ea51cc2eac3e920e5a669f99efd44f446f ("arm: msm: smd: use either
> > package v3 or v4 not both") from the msm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> Ok .. I'll merge the changes in Russell tree into my tree, that should
> fix it I think.
OK, thanks. For simple things like this, I have no problem carrying
fixes until they are repaired in the normal course of events. "git
rerere" does all the work for me.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-05-04 21:26 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-04 1:07 linux-next: manual merge of the msm tree with the arm tree Stephen Rothwell
2010-05-04 16:42 ` Daniel Walker
2010-05-04 21:26 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-10-17 23:35 Stephen Rothwell
2010-10-18 0:02 ` Stephen Rothwell
2010-10-18 8:15 ` Russell King
2010-10-18 17:26 ` Daniel Walker
2010-10-18 18:20 ` Russell King
2010-10-18 18:46 ` Daniel Walker
2010-10-18 19:29 ` Nicolas Pitre
2010-10-18 20:12 ` Daniel Walker
2010-10-18 20:19 ` Arnd Bergmann
2010-10-18 20:37 ` Daniel Walker
2010-10-18 20:48 ` Arnd Bergmann
2010-10-18 21:05 ` Daniel Walker
2010-10-18 21:17 ` Nicolas Pitre
2010-10-18 21:35 ` Daniel Walker
2010-10-18 21:11 ` Nicolas Pitre
2010-10-18 20:58 ` Russell King
2010-10-18 21:29 ` Daniel Walker
2010-10-18 21:58 ` Russell King
2010-10-18 22:27 ` Daniel Walker
2010-10-18 22:35 ` Nicolas Pitre
2010-10-18 22:53 ` Joe Perches
2010-10-19 13:18 ` Arnd Bergmann
2010-10-19 17:03 ` Daniel Walker
2010-10-19 17:18 ` Nicolas Pitre
2010-10-19 18:42 ` Daniel Walker
2010-10-19 18:53 ` Russell King
2010-10-19 19:24 ` Daniel Walker
2010-10-19 18:34 ` Russell King
2010-10-19 18:49 ` Daniel Walker
2010-10-18 23:09 ` Daniel Walker
2010-10-18 23:32 ` Nicolas Pitre
2010-10-18 23:45 ` Daniel Walker
2010-10-19 2:47 ` Nicolas Pitre
2010-10-19 16:55 ` Daniel Walker
2010-10-18 20:19 ` Daniel Walker
2010-10-18 20:57 ` Nicolas Pitre
2011-01-31 2:14 Stephen Rothwell
2011-02-02 18:29 ` David Brown
2011-02-02 19:43 ` Greg KH
2011-02-02 20:00 ` Russell King
2011-02-02 20:32 ` Greg KH
2011-02-02 20:44 ` Russell King
2011-02-02 21:47 ` Nicolas Pitre
2011-02-02 22:46 ` David Brown
2011-02-02 22:59 ` David Brown
2011-02-03 0:15 ` Nicolas Pitre
2011-02-04 17:17 ` Daniel Walker
2011-02-04 17:42 ` Russell King
2011-02-04 18:02 ` David Brown
2011-02-04 18:10 ` Daniel Walker
2011-02-04 19:40 ` Nicolas Pitre
2011-02-04 20:38 ` David Brown
2011-01-31 2:14 Stephen Rothwell
2013-07-31 6:08 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=20100505072645.abdee42d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dwalker@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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