From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Fri, 13 Mar 2015 13:15:43 +1100
> Today's linux-next merge of the net-next tree got a conflict in
> net/socket.c between commits 005139a14660 ("fs: remove ki_nbytes") and
> e9eab93cc2dc ("fs: don't allow to complete sync iocbs through
> aio_complete") from the vfs tree and commit 1b784140474e ("net: Remove
> iocb argument from sendmsg and recvmsg") from the net-next tree.
>
> I fixed it up (mainly using the net-next version - see below) and can
> carry the fix as necessary (no action is required).
Al, how do you want to resolve this?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
