public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the sound tree
Date: Mon, 01 Sep 2008 11:26:38 +0200	[thread overview]
Message-ID: <s5hej44fc8h.wl%tiwai@suse.de> (raw)
In-Reply-To: <20080901190307.f7ba8cca.sfr@canb.auug.org.au>

At Mon, 1 Sep 2008 19:03:07 +1000,
Stephen Rothwell wrote:
> 
> On Mon, 01 Sep 2008 10:34:32 +0200 Takashi Iwai <tiwai@suse.de> wrote:
> >
> > > The other option is for Stephen to just keep fixing the merge,
> > > if we just do nothing his way of doing this is automated.
> > 
> > That's fine for me, too.
> > But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
> > window is opened.
> 
> Thats fine by me.  Looks like whoever gets in first in the merge window
> wins :-)

Well, basically I just need to leave the code David changes as is so
that the patch doesn't conflict.  Then git will resolve the rest
gracefully.

I fixed the conflict and rebuilt my tree now.  Tomorrow's linux-next
merge should work without conflict.  Let me know if you still get a
conflict.


thanks,

Takashi

  reply	other threads:[~2008-09-01  9:26 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-01  4:20 linux-next: manual merge of the sound tree Stephen Rothwell
2008-09-01  4:36 ` David Miller
2008-09-01  5:53   ` Takashi Iwai
2008-09-01  8:28     ` David Miller
2008-09-01  8:34       ` Takashi Iwai
2008-09-01  9:03         ` Stephen Rothwell
2008-09-01  9:26           ` Takashi Iwai [this message]
2008-09-01  9:44         ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2008-12-15  4:25 Stephen Rothwell
2008-07-15  5:47 Stephen Rothwell
2008-07-15  6:23 ` Takashi Iwai
2008-07-15  7:15   ` Stephen Rothwell

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=s5hej44fc8h.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=davem@davemloft.net \
    --cc=linux-next@vger.kernel.org \
    --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