lkml.org 
[lkml]   [2011]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the moduleh tree with the tree
On 10/04/11 07:57, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/staging/iio/industrialio-ring.c between commit 14555b14455f
> ("staging:iio: replacing term ring with buffer in the IIO core") from the
> staging tree and commit 4903058fe223 ("staging: Add export.h for
> THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh
> tree.
>
> The former renamed the file modified by the latter. The new file is
> drivers/staging/iio/industrialio-buffer.c and will need to include
> export.h.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Oct 2011 17:48:56 +1100
> Subject: [PATCH] staging: Add export.h for EXPORT_SYMBOL to
> drivers/staging/iio/industrialio-buffer.c
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>

Sorry Paul, I fear this going to keep happening. Is there
a minimal set of patches Greg could pull into staging-next
to avoid more similar issues?
(assuming it isn't already all sorted out!)
> ---
> drivers/staging/iio/industrialio-buffer.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/iio/industrialio-buffer.c b/drivers/staging/iio/industrialio-buffer.c
> index 4ce101a..628aa69 100644
> --- a/drivers/staging/iio/industrialio-buffer.c
> +++ b/drivers/staging/iio/industrialio-buffer.c
> @@ -14,6 +14,7 @@
> * - Alternative access techniques?
> */
> #include <linux/kernel.h>
> +#include <linux/export.h>
> #include <linux/device.h>
> #include <linux/fs.h>
> #include <linux/cdev.h>



\
 
 \ /
  Last update: 2011-10-04 17:17    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site