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

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

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/video/omap2/dss/rfbi.c between commit 24e6289c029b ("OMAP: DSS2:
remove extra includes from include/video/omapdss.h") from Linus' tree and
commit 06e632e042aa ("video: Add export.h for THIS_MODULE/EXPORT_SYMBOL
to drivers/video") from the moduleh tree.

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

diff --cc drivers/video/omap2/dss/rfbi.c
index 39f4c59,5dbd229..0000000
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@@ -33,8 -33,7 +33,9 @@@
  #include <linux/hrtimer.h>
  #include <linux/seq_file.h>
  #include <linux/semaphore.h>
 +#include <linux/platform_device.h>
 +#include <linux/pm_runtime.h>
+ #include <linux/export.h>
  
  #include <video/omapdss.h>
  #include "dss.h"

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

[Paul Gortmaker]

On Tue, Aug 2, 2011 at 12:52 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/video/omap2/dss/rfbi.c between commit 24e6289c029b ("OMAP: DSS2:
> remove extra includes from include/video/omapdss.h") from Linus' tree and
> commit 06e632e042aa ("video: Add export.h for THIS_MODULE/EXPORT_SYMBOL
> to drivers/video") from the moduleh tree.
>
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

I was making some cosmetic changes to commit logs (such as adding Acked-by
etc) and so took the opportunity to just relocate the export.h
addition up higher
and out of the way, which should make this go away for you/Linus.

Thanks for the heads up,
Paul.

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/video/omap2/dss/rfbi.c
> index 39f4c59,5dbd229..0000000
> --- a/drivers/video/omap2/dss/rfbi.c
> +++ b/drivers/video/omap2/dss/rfbi.c
> @@@ -33,8 -33,7 +33,9 @@@
>  #include <linux/hrtimer.h>
>  #include <linux/seq_file.h>
>  #include <linux/semaphore.h>
>  +#include <linux/platform_device.h>
>  +#include <linux/pm_runtime.h>
> + #include <linux/export.h>
>
>  #include <video/omapdss.h>
>  #include "dss.h"
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

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

[Stephen Rothwell]

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
net/bluetooth/l2cap_sock.c between commit 6230c9b4f895 ("bluetooth:
Properly clone LSM attributes to newly created child connections") from
Linus' tree and commit ac86caa04348 ("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/bluetooth/l2cap_sock.c
index a4a9d12,fa5e166..0000000
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@@ -26,7 -26,7 +26,8 @@@
  
  /* Bluetooth L2CAP sockets. */
  
 +#include <linux/security.h>
+ #include <linux/export.h>
  
  #include <net/bluetooth/bluetooth.h>
  #include <net/bluetooth/hci_core.h>

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

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

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c between commit
124d770a6459 ("pch_gbe: added the process of FIFO over run error") from
Linus' tree and commit c3c292bec445 ("drivers/net: Add module.h to
drivers who were implicitly using it") from the moduleh tree.

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

diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 5dc61b4,848dce1..0000000
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@@ -20,6 -20,8 +20,7 @@@
  
  #include "pch_gbe.h"
  #include "pch_gbe_api.h"
 -#include <linux/prefetch.h>
+ #include <linux/module.h>
  
  #define DRV_VERSION     "1.00"
  const char pch_driver_version[] = DRV_VERSION;