linux-kernel - linux-next: manual merge of the moduleh tree with the device-mapper 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: <20111101182218.0046a4f479cc11a405349736@canb.auug.org.au>
Date:	Tue, 1 Nov 2011 18:22:18 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Thornber <thornber@...hat.com>,
	Mike Snitzer <snitzer@...hat.com>,
	Alasdair G Kergon <agk@...hat.com>
Subject: linux-next: manual merge of the moduleh tree with the device-mapper
 tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/md/persistent-data/dm-space-map-disk.c between commit
661ae8a9604f ("The persistent-data library offers a re-usable framework
for the storage") from the device-mapper tree and fix up patch
"drivers-md-change-module.h-export.h-in-persistent-da.patch" from the
moduleh tree.

I fixed it up (see below) (the include of bitops.h has been removed in
the device-mapper commit).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/md/persistent-data/dm-space-map-disk.c
index aeff785,e6b9d67..0000000
--- a/drivers/md/persistent-data/dm-space-map-disk.c
+++ b/drivers/md/persistent-data/dm-space-map-disk.c
@@@ -12,7 -11,8 +12,7 @@@
  
  #include <linux/list.h>
  #include <linux/slab.h>
- #include <linux/module.h>
 -#include <linux/bitops.h>
+ #include <linux/export.h>
  #include <linux/device-mapper.h>
  
  #define DM_MSG_PREFIX "space map disk"

Content of type "application/pgp-signature" skipped