| 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
| ||
|
Message-Id: <20110928164824.29edfa867dfe583ff5b982e8@canb.auug.org.au>
Date: Wed, 28 Sep 2011 16:48:24 +1000
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,
Jonathan Cameron <jic23@....ac.uk>, Greg KH <greg@...ah.com>
Subject: Re: linux-next: manual merge of the moduleh tree with the staging
tree
Hi Paul,
On Wed, 28 Sep 2011 16:44:19 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/staging/iio/accel/adis16201_ring.c between commit 779921683e6d
> ("staging:iio:accel header housekeeping - remove unecessary includes")
> from the staging tree and commit 15f310ea9641 ("staging: Add export.h for
> THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
> tree.
Also drivers/staging/iio/accel/adis16203_ring.c,
drivers/staging/iio/accel/adis16204_ring.c,
drivers/staging/iio/accel/adis16209_ring.c,
drivers/staging/iio/accel/adis16240_ring.c,
drivers/staging/iio/gyro/adis16260_ring.c and
drivers/staging/iio/meter/ade7758_ring.c
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/staging/iio/accel/adis16203_ring.c
index 993e239,ce23f4a..0000000
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16203.h"
/**
diff --cc drivers/staging/iio/accel/adis16204_ring.c
index 847f438,0d0da0c..0000000
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16204.h"
/**
diff --cc drivers/staging/iio/accel/adis16209_ring.c
index f889fe7,c7f9d59..0000000
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16209.h"
/**
diff --cc drivers/staging/iio/accel/adis16240_ring.c
index 051ba64,a5033b9..0000000
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16240.h"
/**
diff --cc drivers/staging/iio/gyro/adis16260_ring.c
index 10f8a66,85e6fac..0000000
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@@ -3,10 -6,16 +3,11 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include "../iio.h"
-#include "../sysfs.h"
#include "../ring_sw.h"
-#include "../accel/accel.h"
-#include "../trigger.h"
+#include "../trigger_consumer.h"
#include "adis16260.h"
/**
diff --cc drivers/staging/iio/meter/ade7758_ring.c
index 1e2a096,88805b2..0000000
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@@ -9,6 -9,14 +9,7 @@@
#include <linux/kernel.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/export.h>
#include <asm/unaligned.h>
#include "../iio.h"
--
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/
Powered by blists - more mailing lists