linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the moduleh tree with the staging tree
@ 2011-09-28  6:44 Stephen Rothwell
  2011-09-28  6:48 ` Stephen Rothwell
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2011-09-28  6:44 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH

Hi Paul,

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.

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

diff --cc drivers/staging/iio/accel/adis16201_ring.c
index 4b433c5,52ab4f0..0000000
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@@ -3,10 -4,15 +3,11 @@@
  #include <linux/kernel.h>
  #include <linux/spi/spi.h>
  #include <linux/slab.h>
 -#include <linux/sysfs.h>
+ #include <linux/export.h>
  
  #include "../iio.h"
 -#include "../sysfs.h"
  #include "../ring_sw.h"
 -#include "accel.h"
 -#include "../trigger.h"
 +#include "../trigger_consumer.h"
  #include "adis16201.h"
  
  

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the moduleh tree with the staging tree
@ 2011-10-13  6:20 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-13  6:20 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Arend van Spriel, Greg KH

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

Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c,
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c,
drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c between commit fc2d6e573be6
("staging: brcm80211: remove brcm80211 driver from the staging tree")
from the staging tree and commits from the moduleh tree.

The former removed the files, so I did that.
-- 
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 staging tree
@ 2011-10-06  5:31 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-10-06  5:31 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/adc/ad7314.c between commit 48a2c3799b71
("staging:iio:adc:ad7314 removal. Supported via hwmon") from the staging
tree and commit 09ff337cbb48 ("staging: Add module.h to drivers/staging
users") from the moduleh tree.

The former removes this file, so I did that.
-- 
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 staging tree
@ 2011-09-29  5:55 Stephen Rothwell
  2011-09-29 15:15 ` Paul Gortmaker
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2011-09-29  5:55 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/accel/adis16220_core.c between commits 7991029a55fa
("staging:iio:accel:adis16220 iio_chan_spec conversion") and 6f4ebab56870
("staging: iio: adis16220_core.c: add module.h") from the staging tree
and commit 6eee8b750254 ("staging: Add module.h to more drivers
implicitly using it") from the moduleh tree.

The staging commits are a superset of the part of the moduleh commit that
affects this file, so I dropped the moduleh change (module.h was added in
different places).
-- 
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
* linux-next: manual merge of the moduleh tree with the staging tree
@ 2011-09-28  6:40 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-09-28  6:40 UTC (permalink / raw)
  To: Paul Gortmaker
  Cc: linux-next, linux-kernel, Franky Lin, Arend van Spriel, Greg KH

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c between commit 47b4c640b849
("staging: brcm80211: remove global var gInstance from brcmfmac") from
the staging tree and commit 15f310ea9641 ("staging: Add export.h for
THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") 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 drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 8448b8b,51f9335..0000000
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@@ -21,9 -22,7 +22,10 @@@
  #include <linux/pci_ids.h>
  #include <linux/sched.h>
  #include <linux/completion.h>
 +#include <linux/mmc/sdio.h>
 +#include <linux/mmc/sdio_func.h>
 +#include <linux/mmc/card.h>
+ #include <linux/export.h>
  
  #include <defs.h>
  #include <brcm_hw_ids.h>

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the moduleh tree with the staging tree
@ 2011-08-24  5:00 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-08-24  5:00 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/accel/adis16220_core.c between commit 7991029a55fa
("staging:iio:accel:adis16220 iio_chan_spec conversion") from the staging
tree and commit dcf6be043de1 ("staging: Add module.h to drivers/staging
users") from the moduleh tree.

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

diff --cc drivers/staging/iio/accel/adis16220_core.c
index 075e40f,e119874..0000000
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@@ -13,6 -16,8 +13,7 @@@
  #include <linux/spi/spi.h>
  #include <linux/slab.h>
  #include <linux/sysfs.h>
 -#include <linux/list.h>
+ #include <linux/module.h>
  
  #include "../iio.h"
  #include "../sysfs.h"

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-10-13  6:20 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-28  6:44 linux-next: manual merge of the moduleh tree with the staging tree Stephen Rothwell
2011-09-28  6:48 ` Stephen Rothwell
2011-09-28 14:56   ` Paul Gortmaker
  -- strict thread matches above, loose matches on Subject: below --
2011-10-13  6:20 Stephen Rothwell
2011-10-06  5:31 Stephen Rothwell
2011-09-29  5:55 Stephen Rothwell
2011-09-29 15:15 ` Paul Gortmaker
2011-09-28  6:40 Stephen Rothwell
2011-08-24  5:00 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).