Jan Engelhardt wrote: > On Tuesday 2010-02-09 18:33, Patrick McHardy wrote: > >> Thanks Dave. I plan to submit a first batch of patches queued for >> net-next-2.6 soon, however these fixes introduced a large number >> of conflicts. If you could merge net-2.6 into net-next-2.6 I'll >> resolve them and send a pull request. > > Ah that is a good opportunity then to rebase my pending -next patches, > to reduce conflicts you would have to solve when merging things after > the conflict resolution. I've merged the current net-next tree and pushed it out. -- 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
