Subject: Re: linux-next: manual merge of the moduleh tree with the staging tree

From: Paul Gortmaker <[email-masked]>
Date: Wed, 28 Sep 2011 10:56:06 -0400

On 11-09-28 02:48 AM, Stephen Rothwell wrote:
> Hi Paul,
> 
> On Wed, 28 Sep 2011 16:44:19 +1000 Stephen Rothwell <[email-masked]> 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

I've moved the export.h in all of these up near the top to make
the conflict go away.

Thanks,
Paul.