From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 23 Nov 2011 11:17:51 +1100
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> net/ipv4/inet_diag.c between commit 717b6d836646 ("net-netlink: fix diag
> to export IPv4 tos for dual-stack IPv6 sockets") from the net tree and
> commit 4e3fd7a06dc2 ("net: remove ipv6_addr_copy()") from the net-next
> tree.
>
> Just context changes. I fixed it up (see below) can can carry the fix as
> necessary,
Yep, I anticipated this one too, thanks Stephen.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
