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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20131001142655.GA29919@logfs.org>
Date:	Tue, 1 Oct 2013 10:26:55 -0400
From:	Jörn Engel <joern@...fs.org>
To:	Thierry Reding <thierry.reding@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the bcon tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/