From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Subject: Re: linux-next: manual merge of the moduleh tree with the mfd tree Date: Wed, 5 Oct 2011 15:59:42 -0400 Message-ID: <20111005195942.GV14123@windriver.com> References: <20111005183641.922f5e5da976b972f25a6d90@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Received: from mail.windriver.com ([147.11.1.11]:52199 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934378Ab1JET7w (ORCPT ); Wed, 5 Oct 2011 15:59:52 -0400 Content-Disposition: inline In-Reply-To: <20111005183641.922f5e5da976b972f25a6d90@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, 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 > #include > #include > +#include > + #include > > #include "twl-core.h" >