Jan Engelhardt wrote:
On Wednesday 2009-02-11 16:45, Jan Engelhardt wrote:
On Wednesday 2009-02-11 16:06, Patrick McHardy wrote:
How do these interact with the Jamal's pending changes?
I think it should be fine as I am changing just the periphery here.
If it merges without git-pull stopping, after you applied his,
it's probably ok :)
OTOH, I suggest you could do it like Linus [states in his Git
presentation at Google], that is, merging whatever happens to be
first in the mailbox. I think that the statistical distribution
is equal anyway.
Thats why I'm asking. He was first so it would only be fair to
apply his patches first. Your's are more though so might be more
work to fix up. The easiest way might be if you apply Jamal's
patches and I simply pull everything from you. You seem to have
more remarks about these patches than me anyways :)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
