linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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:02:11 -0700	[thread overview]
Message-ID: <200807281502.11427.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20080720192558.GA6576@elte.hu>

On Sunday, July 20, 2008 12:25 pm Ingo Molnar wrote:
> * Dmitry Baryshkov <dbaryshkov@gmail.com> wrote:
> > Hi,
> >
> > These two patches probably are the last for the tip
> > core/generic-dma-coherent branch. The first one converts cris arch to
> > use the generic allocator. The second one adds documentation for new
> > interfaces. So, I think, the branch is ready to be scheduled for the
> > merge (or at least testing in the linux-next).
>
> applied to tip/core/generic-dma-coherent.
>
> Jesse, please pull it into pci.git - the x86 bits are well-tested and
> stable. See the pull coordinates below.
>
> 	Ingo
>
> ---------------------------------->
> Please pull the latest core/generic-dma-coherent git tree from:
>
>    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?

Thanks,
Jesse

  parent reply	other threads:[~2008-07-28 22:02 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   ` Jesse Barnes [this message]
2008-07-28 22:09     ` [git pull] generic coherent dma Ingo Molnar
2008-07-28 22:16       ` Jesse Barnes

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=200807281502.11427.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;
as well as URLs for NNTP newsgroup(s).