linux-kernel - Re: linux-next: manual merge of the bkl-trivial tree with the mmc 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:	Mon, 20 Sep 2010 11:15:25 +0200
From:	Arnd Bergmann <arnd@...db.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Olof Johansson <olof@...om.net>, Chris Ball <cjb@...top.org>
Subject: Re: linux-next: manual merge of the bkl-trivial tree with the mmc tree

On Monday 20 September 2010, Stephen Rothwell wrote:
> Today's linux-next merge of the bkl-trivial tree got a conflict in
> drivers/mmc/card/block.c between commit
> 28280d210bacf6788a5e4b12c5a9430bd50860b4 ("mmc: make number of mmcblk
> minors configurable") from the mmc tree and commit
> 5778067afcfd8b718ffc3744c25fdd194fc886a1 ("block: autoconvert trivial BKL
> users to private mutex") from the bkl-trivial tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, thanks!

Chris, do you want to take my patch into your tree instead? Or even better
you could figure out if the BKL is actually needed there and remove it
otherwise so we don't need to introduce the mutex here.

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