Re: [git pull] generic coherent dma

[Jesse Barnes]

> > >    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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/