From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>,
linux-kernel@vger.kernel.org, Ingo Molnar <mingo@redhat.com>
Subject: Re: [git pull] generic coherent dma
Date: Mon, 28 Jul 2008 15:16:46 -0700 [thread overview]
Message-ID: <200807281516.47137.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20080728220929.GA9845@elte.hu>
> > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git
> > > core/generic-dma-coherent
> >
> > Just tried pulling this; I get conflicts in arch/x86/Kconfig. Is your
> > branch not up to date?
>
> hey, you tried to pull after 8 days in the merge window - that's a few
> thousand commits down the line ;-)
Yeah sorry, this one got buried in my inbox...
> When i send pull requests the branches become generally immutable until
> they get pulled. (i.e. i dont change it under your foot)
>
> i've merged up latest -git and pushed out the result - could you retry?
Yep, got it. Thanks.
Jesse
prev parent reply other threads:[~2008-07-28 22:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-20 10:58 [PATCH 0/2] Generic dma-coherent update Dmitry Baryshkov
2008-07-20 11:00 ` [PATCH 1/2] Cris: convert to using generic dma-coherent mem allocator Dmitry Baryshkov
[not found] ` <20080720192558.GA6576@elte.hu>
2008-07-28 22:02 ` [git pull] generic coherent dma Jesse Barnes
2008-07-28 22:09 ` Ingo Molnar
2008-07-28 22:16 ` Jesse Barnes [this message]
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=200807281516.47137.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek.org \
--cc=dbaryshkov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.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
Powered by JetHome