From: Greg KH <greg@kroah.com>
To: David Brown <davidb@codeaurora.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk@arm.linux.org.uk>,
Stepan Moskovchenko <stepanm@codeaurora.org>
Subject: Re: linux-next: manual merge of the msm tree with the arm tree
Date: Wed, 2 Feb 2011 11:43:59 -0800 [thread overview]
Message-ID: <20110202194359.GC27065@kroah.com> (raw)
In-Reply-To: <8ya4o8m70jp.fsf@huya.qualcomm.com>
On Wed, Feb 02, 2011 at 10:29:14AM -0800, David Brown wrote:
> On Sun, Jan 30 2011, Stephen Rothwell wrote:
>
> > Hi David,
> >
> > Today's linux-next merge of the msm tree got conflicts in
> > arch/arm/mach-msm/board-msm7x27.c, arch/arm/mach-msm/board-msm7x30.c,
> > arch/arm/mach-msm/board-qsd8x50.c and arch/arm/mach-msm/board-sapphire.c
> > between commit eda53d6d032effb653410b79e1b49e652a881744 ("ARM: P2V: avoid
> > initializers and assembly using PHYS_OFFSET") from the arm tree and
> > commit 07a3cc4814f790354d4c7be2c9dc6143a714a07a ("msm: Clean up useless
> > ifdefs") from the msm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> What is the best way to resolve this? I can't really merge against
> Russell's tree, since he may need to rebase his tree before the merge
> window?
Public trees should never be rebased, so that shouldn't happen.
thanks,
greg k-h
next prev parent reply other threads:[~2011-02-02 19:44 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-31 2:14 linux-next: manual merge of the msm tree with the arm tree Stephen Rothwell
2011-02-02 18:29 ` David Brown
2011-02-02 19:43 ` Greg KH [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2013-07-31 6:08 Stephen Rothwell
2011-01-31 2:14 Stephen Rothwell
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
2010-05-04 1:07 Stephen Rothwell
2010-05-04 16:42 ` Daniel Walker
2010-05-04 21: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=20110202194359.GC27065@kroah.com \
--to=greg@kroah.com \
--cc=davidb@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=stepanm@codeaurora.org \
/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.