From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 23 Jun 2010 12:51:16 +1000
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> net/ipv4/ip_output.c between commit
> 26cde9f7e2747b6d254b704594eed87ab959afa5 ("udp: Fix bogus UFO packet
> generation") from the net-current tree and commit
> d8d1f30b95a635dbd610dcc5eb641aca8f4768cf ("net-next: remove useless union
> keyword") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
I recently merged net-2.6 into net-next-2.6, let me know if the problem
persists.
--
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
