From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Daniel Mack <daniel@caiaq•de>, Ben Dooks <ben-linux@fluff•org>,
Russell King <rmk@arm•linux.org.uk>
Subject: linux-next: manual merge of the trivial tree with the arm tree
Date: Mon, 8 Feb 2010 15:48:40 +1100 [thread overview]
Message-ID: <20100208154840.a58f46ad.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
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.
--
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 reply other threads:[~2010-02-08 4:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-08 4:48 Stephen Rothwell [this message]
2010-02-09 10:09 ` linux-next: manual merge of the trivial tree with the arm tree Jiri Kosina
-- 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=20100208154840.a58f46ad.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ben-linux@fluff$(echo .)org \
--cc=daniel@caiaq$(echo .)de \
--cc=jkosina@suse$(echo .)cz \
--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