From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ben Dooks <ben-linux@fluff.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tony Lindgren <tony@atomide.com>,
Kukjin Kim <kgene.kim@samsung.com>,
Adityapratap Sharma <aditya.ps@samsung.com>,
Atul Dahiya <atul.dahiya@samsung.com>
Subject: Re: linux-next: manual merge of the samsung tree with the arm tree
Date: Mon, 1 Mar 2010 09:39:22 +0000 [thread overview]
Message-ID: <20100301093922.GA16639@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20100225104819.6d117587.sfr@canb.auug.org.au>
On Thu, Feb 25, 2010 at 10:48:19AM +1100, Stephen Rothwell wrote:
> Hi Ben,
>
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/mach-s5p6442/include/mach/debug-macro.S between commit
> 4e6d488af37980d224cbf298224db6173673f362 ("ARM: 5910/1: ARM: Add tmp
> register for addruart and loadsp") from the arm tree and commit
> 5f7f6a4a0df9b43051d57fdb8ea96c083247a08f ("ARM: S5P6442: Add Samsung
> S5P6442 CPU support") from the samsung tree.
You're getting this because I've dropped the branch containing all the
trees I'd merged over the last 3 months from the branch(es) you pull.
The PXA folk decided to rebase their tree and send Linus some of their
original commits independently of their previous pull - and their tree
was the first to be merged.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2010-03-01 9:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-24 23:48 linux-next: manual merge of the samsung tree with the arm tree Stephen Rothwell
2010-03-01 9:39 ` Russell King [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-25 0:24 Stephen Rothwell
2010-02-24 0:33 Stephen Rothwell
2010-02-24 0:58 ` Ben Dooks
2010-02-24 1:03 ` 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=20100301093922.GA16639@flint.arm.linux.org.uk \
--to=rmk+lkml@arm.linux.org.uk \
--cc=aditya.ps@samsung.com \
--cc=atul.dahiya@samsung.com \
--cc=ben-linux@fluff.org \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.com \
/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).