linux-kernel - Re: linux-next: manual merge of the block tree with Linus' 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]

Date:	Wed, 17 Mar 2010 10:03:05 +0800
From:	Li Zefan <lizf@...fujitsu.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Jens Axboe <jens.axboe@...cle.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Ben Blum <bblum@...rew.cmu.edu>
Subject: Re: linux-next: manual merge of the block tree with Linus' tree

Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> block/Kconfig between commit 67523c48aa74d5637848edeccf285af1c60bf14a
> ("cgroups: blkio subsystem as module") from Linus' tree and commit
> 910ac735bad53ce54741a72a5b19ab69794ae069 ("block: make CONFIG_BLK_CGROUP
> visible") from the block tree.
> 
> I used the block tree version.

The merge is correct, thanks!

--
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/