Messages in this thread | | | From | Jesse Barnes <> | Subject | Re: [git pull] generic coherent dma | Date | Mon, 28 Jul 2008 15:02:11 -0700 |
| |
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
| |