On Wed, Jul 16, 2014 at 04:43:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/cxt1e1/linux.c between commit c835a6773314 ("net: set
> name_assign_type in alloc_netdev()") from the net-next tree and commit
> 14b596c9d80b ("staging: cxt1e1: remove driver") from the staging tree.
>
> I fixed it up (I just removed the file) and can carry the fix as
> necessary (no action is required).
That is fine, thanks.
greg k-h
--
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
