mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Peter Ujfalusi <peter.ujfalusi@nokia.com>,
	vikram pandita <vikram.pandita@ti.com>,
	Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the sound tree with the omap tree
Date: Fri, 13 Nov 2009 14:06:44 +0100	[thread overview]
Message-ID: <s5h1vk2po9n.wl%tiwai@suse.de> (raw)
In-Reply-To: <20091113123901.GB30966@sirena.org.uk>

At Fri, 13 Nov 2009 12:39:01 +0000,
Mark Brown wrote:
> 
> On Fri, Nov 13, 2009 at 01:19:47PM +1100, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the sound tree got a conflict in
> > arch/arm/mach-omap2/board-zoom2.c between commit
> > 3541a57ebeb4c817e6e25bb0c2a2c174d6edb7c4 ("omap: zoom2: split board file
> > for software reuse") from the omap tree and commits
> > f8d9aad96d0d7b57d0bf2e4de21fdda3a42f4449 ("OMAP: Platform support for
> > twl4030_codec MFD") and 953e2f3d272db9db6671ad4f4244820557a71cf7 ("OMAP:
> > Configure audio_mclk for twl4030-codec MFD") from the sound tree.
> 
> > The former moved the code that the latter modifies into another file.  I
> > have added the following merge fixup patch and can carry it as necessary.
> 
> Adding Tony for the OMAP tree - as discussed previously you could merge
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git twl4030-mfd
> 
> into the OMAP tree to resolve this.  There's some older ASoC changes in
> there to ensure the patches applied but I'm happy for you to carry those
> providing Takashi is.

I can merge the tree above to for-next branch of sound git tree, too.
In that way, we can keep asoc branches clean.


thanks,

Takashi

  reply	other threads:[~2009-11-13 13:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-13  2:19 Stephen Rothwell
2009-11-13 12:39 ` Mark Brown
2009-11-13 13:06   ` Takashi Iwai [this message]
2009-11-13 13:11     ` Mark Brown
2009-11-13 13:14       ` Takashi Iwai
2009-11-13 20:44         ` Tony Lindgren
2009-11-14  3:02           ` Tony Lindgren

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=s5h1vk2po9n.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=peter.ujfalusi@nokia.com \
    --cc=sfr@canb.auug.org.au \
    --cc=tony@atomide.com \
    --cc=vikram.pandita@ti.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

all inboxes | Powered by JetHome®