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

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Todd Poynor <toddpoynor@google.com>,
	Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the moduleh tree with the mfd tree
Date: Wed, 5 Oct 2011 15:59:42 -0400	[thread overview]
Message-ID: <20111005195942.GV14123@windriver.com> (raw)
In-Reply-To: <20111005183641.922f5e5da976b972f25a6d90@canb.auug.org.au>

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

WARNING: multiple messages have this Message-ID (diff)

From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Todd Poynor <toddpoynor@google.com>,
	Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the moduleh tree with the mfd tree
Date: Wed, 5 Oct 2011 15:59:42 -0400	[thread overview]
Message-ID: <20111005195942.GV14123@windriver.com> (raw)
In-Reply-To: <20111005183641.922f5e5da976b972f25a6d90@canb.auug.org.au>

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

next prev parent reply	other threads:[~2011-10-05 19:59 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111005195942.GV14123@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    --cc=sfr@canb.auug.org.au \
    --cc=toddpoynor@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.