I really can't get the other patches in at this point since they
don't really qualify as bug fixes. I'll start a nf-next tree once
Dave opens up the net-next tree, which will be in about two weeks.
Sorry about that, I know its partially my fault.

I've tried applying this without the others, and it applies and
compiled cleanly with one minor reject:

> --- a/net/netfilter/nf_conntrack_netlink.c
> +++ b/net/netfilter/nf_conntrack_netlink.c
> @@ -445,7 +445,7 @@ static inline size_t calculate_helper_room_size(const struct nf_conn *ct)
>  {
>  	const struct nf_conn_help *help = nfct_help(ct);
>  	struct nf_conntrack_helper *helper;
> -	size_t size;
> +	size_t size = 0;
>  
>  	if (!help)
>  		goto out;

This chunk doesn't apply, but it doesn't seem to belong in the patch
anyway.

Do you want me to apply the patch as attached to this email, or would
you prefer to rediff it?