On Wednesday 2009-02-11 16:45, Jan Engelhardt wrote: >On Wednesday 2009-02-11 16:06, Patrick McHardy wrote: >> jengelh@xxxxxxxxxx wrote: >>> Please pull from >>> git://dev.medozas.de/iptables master >>> to recive >>> Jan Engelhardt (8): >>> libxtables: recognize IP6TABLES_LIB_DIR old-style environment variable >>> build: move -ldl to proper LDADD >>> libxtables: remove unused XT_LIB_DIR macro >>> libxtables: decouple non-xtables parts from header >>> src: remove iptables_rule_match indirection macro >>> src: remove unused ipt_tryload macro >>> libxtables: move compat defines to xtables.c >>> src: consolidate duplicate code in iptables/internal.h >> >> 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. -- 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
