public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c
@ 2012-02-05  0:32 Jesper Juhl
  0 siblings, 0 replies; 5+ messages in thread
From: Jesper Juhl @ 2012-02-05  0:32 UTC (permalink / raw)
  To: linux-kernel
  Cc: trivial, Anton Vorontsov, MyungJoo Ham, Axel Lin, Paul Gortmaker,
	Samuel Ortiz

Remove the duplicate.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
 drivers/power/max8998_charger.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index 9b3f2bf..5c5f281 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -21,7 +21,6 @@
 
 #include <linux/module.h>
 #include <linux/err.h>
-#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
-- 
1.7.9


-- 
Jesper Juhl <jj@chaosbits.net>       http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.


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

* Re: [PATCH] power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c
@ 2012-02-06  1:57 함명주
  2012-03-15 17:17 ` Anton Vorontsov
  0 siblings, 1 reply; 5+ messages in thread
From: 함명주 @ 2012-02-06  1:57 UTC (permalink / raw)
  To: Jesper Juhl, linux-kernel@vger.kernel.org
  Cc: trivial@kernel.org, Anton Vorontsov, Axel Lin, Paul Gortmaker,
	Samuel Ortiz

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=euc-kr, Size: 985 bytes --]

> Remove the duplicate.
> 
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>

Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>

> ---
>  drivers/power/max8998_charger.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
> index 9b3f2bf..5c5f281 100644
> --- a/drivers/power/max8998_charger.c
> +++ b/drivers/power/max8998_charger.c
> @@ -21,7 +21,6 @@
>  
>  #include <linux/module.h>
>  #include <linux/err.h>
> -#include <linux/module.h>
>  #include <linux/slab.h>
>  #include <linux/platform_device.h>
>  #include <linux/power_supply.h>
> -- 
> 1.7.9
> 
> 
> -- 
> Jesper Juhl <jj@chaosbits.net>       http://www.chaosbits.net/
> Don't top-post http://www.catb.org/jargon/html/T/top-post.html
> Plain text mails only, please.
> 
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

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

* Re: [PATCH] power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c
  2012-02-06  1:57 [PATCH] power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c 함명주
@ 2012-03-15 17:17 ` Anton Vorontsov
  2012-03-15 19:11   ` Paul Gortmaker
  0 siblings, 1 reply; 5+ messages in thread
From: Anton Vorontsov @ 2012-03-15 17:17 UTC (permalink / raw)
  To: 함명주
  Cc: Jesper Juhl, linux-kernel@vger.kernel.org, trivial@kernel.org,
	Axel Lin, Paul Gortmaker, Samuel Ortiz

On Mon, Feb 06, 2012 at 01:57:54AM +0000, 함명주 wrote:
> > Remove the duplicate.
> > 
> > Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> 
> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>

Applied, thanks!

> 
> > ---
> >  drivers/power/max8998_charger.c |    1 -
> >  1 files changed, 0 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
> > index 9b3f2bf..5c5f281 100644
> > --- a/drivers/power/max8998_charger.c
> > +++ b/drivers/power/max8998_charger.c
> > @@ -21,7 +21,6 @@
> >  
> >  #include <linux/module.h>
> >  #include <linux/err.h>
> > -#include <linux/module.h>
> >  #include <linux/slab.h>
> >  #include <linux/platform_device.h>
> >  #include <linux/power_supply.h>
> > -- 
> > 1.7.9

-- 
Anton Vorontsov
Email: cbouatmailru@gmail.com

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

* Re: [PATCH] power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c
  2012-03-15 17:17 ` Anton Vorontsov
@ 2012-03-15 19:11   ` Paul Gortmaker
  2012-03-15 20:54     ` Jesper Juhl
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Gortmaker @ 2012-03-15 19:11 UTC (permalink / raw)
  To: Anton Vorontsov
  Cc: 함명주, Jesper Juhl,
	linux-kernel@vger.kernel.org, trivial@kernel.org, Axel Lin,
	Samuel Ortiz

On 12-03-15 01:17 PM, Anton Vorontsov wrote:
> On Mon, Feb 06, 2012 at 01:57:54AM +0000, 함명주 wrote:
>>> Remove the duplicate.
>>>
>>> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
>>
>> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>
> 
> Applied, thanks!

There is already a commit queued in linux-next that deletes
all the duplicates at once.  It just so happens to delete
the other instance vs the one shown here.  So if both
commits are present, then there won't be *any* module.h
left, and the build will fail.  If it is possible, please
just drop this patch, since the treewide duplicate patch
will still have to exist to fix the other instances.

https://lkml.org/lkml/2012/2/29/586

Thanks,
Paul.

> 
>>
>>> ---
>>>  drivers/power/max8998_charger.c |    1 -
>>>  1 files changed, 0 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
>>> index 9b3f2bf..5c5f281 100644
>>> --- a/drivers/power/max8998_charger.c
>>> +++ b/drivers/power/max8998_charger.c
>>> @@ -21,7 +21,6 @@
>>>  
>>>  #include <linux/module.h>
>>>  #include <linux/err.h>
>>> -#include <linux/module.h>
>>>  #include <linux/slab.h>
>>>  #include <linux/platform_device.h>
>>>  #include <linux/power_supply.h>
>>> -- 
>>> 1.7.9
> 

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

* Re: [PATCH] power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c
  2012-03-15 19:11   ` Paul Gortmaker
@ 2012-03-15 20:54     ` Jesper Juhl
  0 siblings, 0 replies; 5+ messages in thread
From: Jesper Juhl @ 2012-03-15 20:54 UTC (permalink / raw)
  To: Paul Gortmaker
  Cc: Anton Vorontsov, 함명주,
	linux-kernel@vger.kernel.org, trivial@kernel.org, Axel Lin,
	Samuel Ortiz

[-- Attachment #1: Type: TEXT/PLAIN, Size: 970 bytes --]

On Thu, 15 Mar 2012, Paul Gortmaker wrote:

> On 12-03-15 01:17 PM, Anton Vorontsov wrote:
> > On Mon, Feb 06, 2012 at 01:57:54AM +0000, 함명주 wrote:
> >>> Remove the duplicate.
> >>>
> >>> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> >>
> >> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>
> > 
> > Applied, thanks!
> 
> There is already a commit queued in linux-next that deletes
> all the duplicates at once.  It just so happens to delete
> the other instance vs the one shown here.  So if both
> commits are present, then there won't be *any* module.h
> left, and the build will fail.  If it is possible, please
> just drop this patch, since the treewide duplicate patch
> will still have to exist to fix the other instances.
> 
> https://lkml.org/lkml/2012/2/29/586
> 

I agree. Drop this one.

-- 
Jesper Juhl <jj@chaosbits.net>       http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

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

end of thread, other threads:[~2012-03-15 20:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-06  1:57 [PATCH] power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c 함명주
2012-03-15 17:17 ` Anton Vorontsov
2012-03-15 19:11   ` Paul Gortmaker
2012-03-15 20:54     ` Jesper Juhl
  -- strict thread matches above, loose matches on Subject: below --
2012-02-05  0:32 Jesper Juhl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox