linux-next: manual merge of the moduleh tree with the tree

linux-next: manual merge of the moduleh tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/plat-s5p/dev-tv.c from merge fix patch
"arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from the
moduleh tree.

This file has been removed, so I dropped that hunk.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Paul Gortmaker]

On 11-10-25 04:45 AM, Stephen Rothwell wrote:
> Hi Paul,
> 
> Today's linux-next merge of the moduleh tree got a conflict in
> arch/arm/plat-s5p/dev-tv.c from merge fix patch
> "arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from the
> moduleh tree.
> 
> This file has been removed, so I dropped that hunk.

Hi Stephen,

I'm surprised to see this, since I'd dropped this chunk based on
the last linux-next build you did before leaving for vacation.
You should see this commit in the merge fix repo.

~$git ls-remote git://openlinux.windriver.com/people/paulg/modsplit-post-merge
edaec64f302889b6f6eaf2d206782f46768d9922	HEAD
edaec64f302889b6f6eaf2d206782f46768d9922	refs/heads/master
~$

Maybe the server fell over again when you were trying to update?

Thanks,
Paul.

---

commit edaec64f302889b6f6eaf2d206782f46768d9922
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
Date:   Thu Oct 13 22:25:20 2011 -0400

    drop dev-tv chunk from arm fixup patch
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch b/arm-Ad
index 9e1cbbb..89e71ed 100644
--- a/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch
+++ b/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch
@@ -10,18 +10,6 @@ new export.h file included that provides them.
 
 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
-diff --git a/arch/arm/plat-s5p/dev-tv.c b/arch/arm/plat-s5p/dev-tv.c
-index 361a1b6..7c5fb88 100644
---- a/arch/arm/plat-s5p/dev-tv.c
-+++ b/arch/arm/plat-s5p/dev-tv.c
-@@ -11,6 +11,7 @@
- */
- 
- #include <linux/dma-mapping.h>
-+#include <linux/export.h>
- 
- #include <mach/irqs.h>
- #include <mach/map.h>
 diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c
 index 6e3d9ab..93a994a 100644
 --- a/arch/arm/plat-samsung/dma-ops.c

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 831 bytes --]

Hi Paul,

On Wed, 26 Oct 2011 15:57:42 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> I'm surprised to see this, since I'd dropped this chunk based on
> the last linux-next build you did before leaving for vacation.
> You should see this commit in the merge fix repo.
> 
> ~$git ls-remote git://openlinux.windriver.com/people/paulg/modsplit-post-merge
> edaec64f302889b6f6eaf2d206782f46768d9922	HEAD
> edaec64f302889b6f6eaf2d206782f46768d9922	refs/heads/master
> ~$
> 
> Maybe the server fell over again when you were trying to update?

Sorry, I know what happened ... I fetched the new origin/master, but did
not pull it into master (the checked out branch).  It will be better next
time.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the moduleh tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/plat-s5p/dev-tv.c between commits from the s5p tree and fixup
patch "arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from
the moduleh tree.

The file above has been removed, so I dropped that hunk from the patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Paul Gortmaker]

[Re: linux-next: manual merge of the moduleh tree with the  tree] On 04/10/2011 (Tue 16:22) Jonathan Cameron wrote:

> 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!)

Git will handle renames without issue (e.g. net-next renames
nearly all the drivers, and there are no issues there). I'm
not sure what you've got planned that makes you think this will keep
happening, but regardless, what you can do to help out is this:

If you create/rewrite some staging driver, check whether it
uses module_param and only that -- if so it needs moduleparam.h

Then check if it uses MODULE_* or module_*  -- such as
MODULE_LICENSE and module_table or similar.  If so you really
need to include module.h or else it will build fail in linux-next.
The module.h will give you moduleparam.h (and export.h in l-next).

Finally if it only uses EXPORT_SYMBOL and/or THIS_MODULE, it will
eventually need export.h -- but since your tree won't have that
file (yet) you can put a module.h include into that file, and give
me a heads up on it and I can "downgrade" the include to be just
for export.h later (via my post-merge queue of patches).  By putting
the module.h in as a placeholder for the export.h, you manage to
avoid Stephen having to deal with it as a build failure.

Greg can't pull the module.h tree into staging permanently since
the streams have to be presented separately for the final permanent
merge upstream.  But there is nothing stopping you from fetching
the module.h content, merging it into your sandbox and having it
present during your testing if you were so inclined.

Thanks for asking,
Paul.

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

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

[Jonathan Cameron]

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>

linux-next: manual merge of the moduleh tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]

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


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the moduleh tree with the tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
net/mac80211/util.c and net/wireless/util.c between commit 0879fa44b541
("cfg80211/mac80211: move information element parsing logic to cfg80211")
from the net tree and commit c1f5764979c5 ("net: Add export.h for
EXPORT_SYMBOL/THIS_MODULE to non-modules") from the moduleh tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/mac80211/util.c
index 2c9dc36,7a55c69..0000000
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@@ -19,6 -19,8 +19,7 @@@
  #include <linux/etherdevice.h>
  #include <linux/if_arp.h>
  #include <linux/bitmap.h>
 -#include <linux/crc32.h>
+ #include <linux/export.h>
  #include <net/net_namespace.h>
  #include <net/cfg80211.h>
  #include <net/rtnetlink.h>
diff --cc net/wireless/util.c
index 6304ed6,3ba8eea..0000000
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@@ -6,7 -6,7 +6,8 @@@
  #include <linux/bitops.h>
  #include <linux/etherdevice.h>
  #include <linux/slab.h>
 +#include <linux/crc32.h>
+ #include <linux/export.h>
  #include <net/cfg80211.h>
  #include <net/ip.h>
  #include "core.h"

linux-next: manual merge of the moduleh tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/dma/ste_dma40.c between commit f4b89764c470
("dmaengine/ste_dma40: use AMBA PrimeCell helper macros") from the
slave-dma tree and commit dbd9b79ce7bd ("Add export.h
to /home/paul/git/module.h/linux-2.6.git/drivers/dma/ste_dma40.c") from
the moduleh tree.

Just a trivla context change.  I fixed it up (just overlapping include
additions) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]