From: Takashi Iwai <tiwai@suse.de>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the sound tree
Date: Mon, 01 Sep 2008 10:34:32 +0200 [thread overview]
Message-ID: <s5hk5dwfenb.wl%tiwai@suse.de> (raw)
In-Reply-To: <20080901.012827.193698949.davem@davemloft.net>
At Mon, 01 Sep 2008 01:28:27 -0700 (PDT),
David Miller wrote:
>
> > Where can I find this change? I now looked at
> > git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
> > but it has no such a commit
>
> sparc-next-2.6.git is where "-next" changes for Sparc live :)
Ah, that obvious one. Thanks.
> > I can either remove the affecting chunk in my patch, or merge your
> > patch first to my tree and rebase.
>
> 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.
Takashi
next prev parent reply other threads:[~2008-09-01 8:34 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 [this message]
2008-09-01 9:03 ` Stephen Rothwell
2008-09-01 9:26 ` Takashi Iwai
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=s5hk5dwfenb.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