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