linux-kernel - linux-next: manual merge of the device-mapper 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>] [day] [month] [year] [list]

Message-Id: <20130304113647.c9d5cf947873ddd476a18506@canb.auug.org.au>
Date:	Mon, 4 Mar 2013 11:36:47 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alasdair G Kergon <agk@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Thornber <ejt@...hat.com>,
	Heinz Mauelshagen <mauelshagen@...hat.com>,
	Mike Snitzer <snitzer@...hat.com>
Subject: linux-next: manual merge of the device-mapper tree with Linus' tree

Hi Alasdair,

Today's linux-next merge of the device-mapper tree got a conflict in
drivers/md/dm-cache-target.c between commit c6b4fcbad044 ("m: add cache
target") from Linus' tree and commit 2db8e6e2cd1c ("Add a target that
allows a fast device such as an SSD to be used as a") from the
device-mapper tree.

These are basically the same patch.  I used the version from Linus' tree
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped