linux-kernel - Re: linux-next: manual merge of the moduleh tree with the 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4E8B24BE.8060102@cam.ac.uk>
Date:	Tue, 04 Oct 2011 16:22:38 +0100
From:	Jonathan Cameron <jic23@....ac.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Paul Gortmaker <paul.gortmaker@...driver.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg KH <greg@...ah.com>
Subject: Re: 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@...b.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@...b.auug.org.au>
Acked-by: Jonathan Cameron <jic23@....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>

--
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/