Most patches for 4.1 are no longer needed, only a minor patch to fix a
missing WAIT_ANY constant. 2.5.0 depends on nf_conntrack (ipv4 and ipv6)

Signed-off-by: Jeroen van Bemmel <jvb127@gmail.com>