Re: linux-next: manual merge of the bcon tree

[JÃrn Engel]

On Tue, 1 October 2013 13:07:17 +0200, Thierry Reding wrote:
> 
> Today's linux-next merge of the bcon tree got conflicts in:
> 
> 	drivers/block/Kconfig
> 	kernel/printk.c
> 
> I fixed them up (see below). Please check if the resolution looks correct.

I think for the moment you can drop the bcon tree.  I have plans to
get it merged into mainline eventually, but currently lack time to
spend on it.  In other words, it isn't really -next material.

JÃrn

--
Doubt is not a pleasant condition, but certainty is an absurd one.
-- Voltaire
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/