From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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 sound tree with the arm tree
Date: Thu, 22 Jul 2010 08:18:50 +0200 [thread overview]
Message-ID: <s5hhbjs9gz9.wl%tiwai@suse.de> (raw)
In-Reply-To: <20100722112831.c6345379.sfr@canb.auug.org.au>
At Thu, 22 Jul 2010 11:28:31 +1000,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> arch/arm/mach-ep93xx/clock.c between commit
> a99b53f80962ed98f4b598dc22f8c030b5dae55a ("ARM: AMBA: Add pclk support to
> AMBA bus infrastructure") from the arm tree and commit
> ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support")
> from the sound tree.
>
> Just context changes. I fixed it up (it was just a blank line) and can
> carry the fix as necessary.
Thanks!
Takashi
next prev parent reply other threads:[~2010-07-22 6:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-22 1:28 Stephen Rothwell
2010-07-22 6:18 ` Takashi Iwai [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-19 1:00 Stephen Rothwell
2010-07-20 9:03 ` Mark Brown
2010-07-20 20:54 ` Ryan Mallon
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=s5hhbjs9gz9.wl%tiwai@suse.de \
--to=tiwai@suse.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 \
/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
all inboxes | Powered by JetHome®