From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 7 Oct 2010 12:31:04 +1100
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> net/caif/caif_socket.c between commit
> 79315068f4560f3f7bd6e9790190dcb43059770c ("caif: fix two caif_connect()
> bugs") from the net-current tree and commit
> b31fa5bad576cd8180a5ad70c648333b44320d44 ("net/caif: Use pr_fmt") from
> the net tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks Stephen, I'm merging net-2.6 into net-next-2.6 right now
to resolve this.
Thanks!
--
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
