linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the moduleh tree with the  tree
@ 2011-10-13  6:31 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-13  6:31 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel

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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the moduleh tree with the  tree
@ 2011-10-25  8:45 Stephen Rothwell
  2011-10-26 19:57 ` Paul Gortmaker
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-25  8:45 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel

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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the moduleh tree with the  tree
@ 2011-10-04  6:57 Stephen Rothwell
  2011-10-04 15:22 ` Jonathan Cameron
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-04  6:57 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the moduleh tree with the  tree
@ 2011-09-28  6:53 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-09-28  6:53 UTC (permalink / raw)
  To: Paul Gortmaker
  Cc: linux-next, linux-kernel, Yogesh Ashok Powar, Amitkumar Karwar,
	Bing Zhao, John W. Linville, David Miller, netdev

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"

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the moduleh tree with the  tree
@ 2011-08-01  3:09 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-08-01  3:09 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Linus Walleij, Vinod Koul

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-10-26 20:49 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-13  6:31 linux-next: manual merge of the moduleh tree with the tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2011-10-25  8:45 Stephen Rothwell
2011-10-26 19:57 ` Paul Gortmaker
2011-10-26 20:48   ` Stephen Rothwell
2011-10-04  6:57 Stephen Rothwell
2011-10-04 15:22 ` Jonathan Cameron
2011-10-05  4:18   ` Paul Gortmaker
2011-09-28  6:53 Stephen Rothwell
2011-08-01  3:09 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).