linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the moduleh tree with the mfd tree
@ 2011-10-05  7:36 Stephen Rothwell
  2011-10-05 19:59 ` Paul Gortmaker
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-10-05  7:36 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Todd Poynor, Samuel Ortiz

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/mfd/twl6030-irq.c between commit 2b8af0825999 ("mfd: Fix twl6030
lockdep recursion warning on setting wake IRQs") from the mfd tree and
commit c86747746435 ("mfd: Add export.h for EXPORT_SYMBOL/THIS_MODULE as
required") 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/mfd/twl6030-irq.c
index deec3ec,b57383b..0000000
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@@ -37,7 -37,7 +37,8 @@@
  #include <linux/kthread.h>
  #include <linux/i2c/twl.h>
  #include <linux/platform_device.h>
 +#include <linux/suspend.h>
+ #include <linux/export.h>
  
  #include "twl-core.h"
  

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

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

* Re: linux-next: manual merge of the moduleh tree with the mfd tree
  2011-10-05  7:36 linux-next: manual merge of the moduleh tree with the mfd tree Stephen Rothwell
@ 2011-10-05 19:59 ` Paul Gortmaker
  0 siblings, 0 replies; 6+ messages in thread
From: Paul Gortmaker @ 2011-10-05 19:59 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Todd Poynor, Samuel Ortiz

[linux-next: manual merge of the moduleh tree with the mfd tree] On 05/10/2011 (Wed 18:36) Stephen Rothwell wrote:

> Hi Paul,
> 
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/mfd/twl6030-irq.c between commit 2b8af0825999 ("mfd: Fix twl6030
> lockdep recursion warning on setting wake IRQs") from the mfd tree and
> commit c86747746435 ("mfd: Add export.h for EXPORT_SYMBOL/THIS_MODULE as
> required") from the moduleh tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.


I've relocated this include to avoid the conflict, and also dropped the
two post-merge patches that Greg now has.

Thanks,
Paul.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/mfd/twl6030-irq.c
> index deec3ec,b57383b..0000000
> --- a/drivers/mfd/twl6030-irq.c
> +++ b/drivers/mfd/twl6030-irq.c
> @@@ -37,7 -37,7 +37,8 @@@
>   #include <linux/kthread.h>
>   #include <linux/i2c/twl.h>
>   #include <linux/platform_device.h>
>  +#include <linux/suspend.h>
> + #include <linux/export.h>
>   
>   #include "twl-core.h"
>   

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

* linux-next: manual merge of the moduleh tree with the mfd tree
@ 2012-03-09  6:19 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-03-09  6:19 UTC (permalink / raw)
  To: Paul Gortmaker
  Cc: linux-next, linux-kernel, Linus Walleij, Maxime Coquelin,
	Alex Macro, Michel Jaouen, Samuel Ortiz

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
include/linux/mfd/abx500/ab8500.h between commit 0f6208375951 ("mfd: Add
ab8500 version detection and enforcing") from the mfd tree and commit
3a55cc4f6e53 ("device.h: audit and cleanup users in main include dir")
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 include/linux/mfd/abx500/ab8500.h
index 4b2df29,dca9439..0000000
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@@ -7,31 -7,11 +7,34 @@@
  #ifndef MFD_AB8500_H
  #define MFD_AB8500_H
  
- #include <linux/device.h>
+ #include <linux/mutex.h>
+ 
+ struct device;
+ 
  /*
 + * AB IC versions
 + *
 + * AB8500_VERSION_AB8500 should be 0xFF but will never be read as need a
 + * non-supported multi-byte I2C access via PRCMU. Set to 0x00 to ease the
 + * print of version string.
 + */
 +enum ab8500_version {
 +	AB8500_VERSION_AB8500 = 0x0,
 +	AB8500_VERSION_AB8505 = 0x1,
 +	AB8500_VERSION_AB9540 = 0x2,
 +	AB8500_VERSION_AB8540 = 0x3,
 +	AB8500_VERSION_UNDEFINED,
 +};
 +
 +/* AB8500 CIDs*/
 +#define AB8500_CUTEARLY	0x00
 +#define AB8500_CUT1P0	0x10
 +#define AB8500_CUT1P1	0x11
 +#define AB8500_CUT2P0	0x20
 +#define AB8500_CUT3P0	0x30
 +#define AB8500_CUT3P3	0x33
 +
 +/*
   * AB8500 bank addresses
   */
  #define AB8500_SYS_CTRL1_BLOCK	0x1

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

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

* linux-next: manual merge of the moduleh tree with the mfd tree
@ 2011-11-01  7:05 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-11-01  7:05 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Linus Walleij, Samuel Ortiz

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/mfd/ab3550-core.c between commit 6508204630f4 ("mfd: Delete
ab3550 driver") from the mfd tree and commit 4e36dd331423 ("mfd: Add
module.h to the implicit drivers/mfd users") from the moduleh tree.

The latter deleted the 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] 6+ messages in thread

* Re: linux-next: manual merge of the moduleh tree with the mfd tree
  2011-09-27  6:29 Stephen Rothwell
@ 2011-09-27 14:54 ` Paul Gortmaker
  0 siblings, 0 replies; 6+ messages in thread
From: Paul Gortmaker @ 2011-09-27 14:54 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Linus Walleij, Samuel Ortiz

On Tue, Sep 27, 2011 at 2:29 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/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete
> ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add
> module.h to the implicit drivers/mfd users") from the moduleh tree.
>
> The former removes this file, so I did that.

Thanks -- I'll simply drop the changes to that file.  I'll have an alternate
pull site for linux-next to you by your tomorrow morning as well.

P.

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

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

* linux-next: manual merge of the moduleh tree with the mfd tree
@ 2011-09-27  6:29 Stephen Rothwell
  2011-09-27 14:54 ` Paul Gortmaker
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-09-27  6:29 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Linus Walleij, Samuel Ortiz

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete
ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add
module.h to the implicit drivers/mfd 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: 490 bytes --]

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

end of thread, other threads:[~2012-03-09  6:19 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-05  7:36 linux-next: manual merge of the moduleh tree with the mfd tree Stephen Rothwell
2011-10-05 19:59 ` Paul Gortmaker
  -- strict thread matches above, loose matches on Subject: below --
2012-03-09  6:19 Stephen Rothwell
2011-11-01  7:05 Stephen Rothwell
2011-09-27  6:29 Stephen Rothwell
2011-09-27 14:54 ` Paul Gortmaker

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