Re: linux-next: manual merge of the sound tree with the arm tree

From: Takashi Iwai
Date: Thu Jul 22 2010 - 02:18:56 EST

Next message: Wu Fengguang: "[PATCH 3/6] writeback: kill writeback_control.more_io"
Previous message: Amerigo Wang: "[Patch] kexec: increase max of kexec segments and use dynamic allocation"
In reply to: Stephen Rothwell: "linux-next: manual merge of the sound tree with the arm tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Wu Fengguang: "[PATCH 3/6] writeback: kill writeback_control.more_io"
Previous message: Amerigo Wang: "[Patch] kexec: increase max of kexec segments and use dynamic allocation"
In reply to: Stephen Rothwell: "linux-next: manual merge of the sound tree with the arm tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]