linux-next: manual merge of the sound tree with the arm tree
in [Kernel]
|
Prev: linux-next: build failure after merge of the vfs tree
Next: [RFC] CFQ: Make prio_trees per cfq group basis to improve IO performance
From: Stephen Rothwell on 18 Jul 2010 21:10 Hi Takashi, Today's linux-next merge of the sound tree got a conflict in arch/arm/mach-ep93xx/clock.c between commit 5c6649e3c1511b183f12d2e884d2c172fe9001e0 ("ARM: AMBA: Add pclk definition for platforms using primecells") from the arm tree and commit ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support") from the sound tree. Just overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc arch/arm/mach-ep93xx/clock.c index d40826a,8031624..0000000 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@@ -43,9 -43,9 +43,11 @@@ static unsigned long get_uart_rate(stru static int set_keytchclk_rate(struct clk *clk, unsigned long rate); static int set_div_rate(struct clk *clk, unsigned long rate); + static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate); + static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate); +static struct clk dummy_apb_pclk; + static struct clk clk_xtali = { .rate = EP93XX_EXT_CLK_RATE, }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Mark Brown on 20 Jul 2010 05:10 On Mon, Jul 19, 2010 at 11:00:54AM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the sound tree got a conflict in > arch/arm/mach-ep93xx/clock.c between commit > 5c6649e3c1511b183f12d2e884d2c172fe9001e0 ("ARM: AMBA: Add pclk definition > for platforms using primecells") from the arm tree and commit > ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support") > from the sound tree. > Just overlapping additions. I fixed it up (see below) and can carry the > fix as necessary. Ryan, can you investigate where (if anywhere is good) the best place to carry the merge fixup is please? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Ryan Mallon on 20 Jul 2010 17:00
On 07/20/2010 09:03 PM, Mark Brown wrote: > On Mon, Jul 19, 2010 at 11:00:54AM +1000, Stephen Rothwell wrote: > >> Today's linux-next merge of the sound tree got a conflict in >> arch/arm/mach-ep93xx/clock.c between commit >> 5c6649e3c1511b183f12d2e884d2c172fe9001e0 ("ARM: AMBA: Add pclk definition >> for platforms using primecells") from the arm tree and commit >> ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support") >> from the sound tree. > >> Just overlapping additions. I fixed it up (see below) and can carry the >> fix as necessary. > > Ryan, can you investigate where (if anywhere is good) the best place to > carry the merge fixup is please? The fix is fine. I don't really know much about how merge conflicts are handled across trees, but I would think that it is probably easiest if Stephen carries it. ~Ryan -- Bluewater Systems Ltd - ARM Technology Solution Centre Ryan Mallon 5 Amuri Park, 404 Barbadoes St ryan(a)bluewatersys.com PO Box 13 889, Christchurch 8013 http://www.bluewatersys.com New Zealand Phone: +64 3 3779127 Freecall: Australia 1800 148 751 Fax: +64 3 3779135 USA 1800 261 2934 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |