From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tony Lindgren <tony@atomide.com>,
Russell King <rmk@arm.linux.org.uk>,
Daniel Mack <daniel@caiaq.de>, Ben Dooks <ben-linux@fluff.org>
Subject: Re: linux-next: manual merge of the trivial tree with the arm tree
Date: Tue, 9 Feb 2010 11:09:08 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.00.1002091108080.30967@pobox.suse.cz> (raw)
In-Reply-To: <20100208154840.a58f46ad.sfr@canb.auug.org.au>
On Mon, 8 Feb 2010, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-u300/include/mach/debug-macro.S between commit
> 7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
> register for addruart and loadsp") from the arm tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks for the fix, I will leave this up to merge with Linus when either I
or Linus will fix that up.
On Mon, 8 Feb 2010, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/plat-s3c64xx/irq.c between commit
> 51022cf6591ae2945960d034788bdeffa28cde13 ("ARM: SAMSUNG: Move IRQ UART
> handling for newer devices to plat-samsung") from the arm tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
>
> The former removes the comment updated by the latter.
Removed the hunk, thanks.
On Mon, 8 Feb 2010, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/plat-s5pc1xx/irq.c between commit
> be97162d47b2e067f9d21097650f2f0405dacc9f ("ARM: S5PC1XX: Use common UART
> IRQ handling code") from the arm tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
>
> The former removes the comment updated by the latter.
Removed this one as well.
Thanks!
--
Jiri Kosina
SUSE Labs, Novell Inc.
next prev parent reply other threads:[~2010-02-09 10:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-08 4:48 linux-next: manual merge of the trivial tree with the arm tree Stephen Rothwell
2010-02-09 10:09 ` Jiri Kosina [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-04-26 5:27 Stephen Rothwell
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:48 Stephen Rothwell
2009-11-25 7:29 Stephen Rothwell
2009-11-25 11:26 ` Jiri Kosina
2009-09-07 6:32 Stephen Rothwell
2009-09-07 15:14 ` Jiri Kosina
2009-09-07 15:17 ` Russell King
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=alpine.LNX.2.00.1002091108080.30967@pobox.suse.cz \
--to=jkosina@suse.cz \
--cc=ben-linux@fluff.org \
--cc=daniel@caiaq.de \
--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=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).