LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Russell King <rmk@arm.linux.org.uk>
To: Lucas Woods <woodzy@gmail.com>,
	Andre Haupt <andre@bitwigglers.org>,
	Michael-Luke Jones <jonesml@fastmail.to>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linux Kernel List <linux-kernel@vger.kernel.org>
Subject: Fwd: Issue with arm-devel tree
Date: Sat, 12 Jan 2008 14:54:49 +0000	[thread overview]
Message-ID: <20080112145449.GA11341@flint.arm.linux.org.uk> (raw)

It might be a good idea if there was some co-ordination with people
involved in the duplicate include removal work...

    [ARM] remove duplicate includes
    
    Signed-off-by: Lucas Woods <woodzy@gmail.com>
    Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <linux/reboot.h>
 
 #include <asm/mach-types.h>


    [ARM] ixp4xx: remove double include
    
     Remove double include.
    
    Signed-off-by: Andre Haupt <andre@bitwigglers.org>
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

@@ -18,7 +18,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/reboot.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/reboot.h>

I've dropped the "ixp4xx: remove double include" commit and fixed the
resulting breakage of "remove duplicate includes" change to resolve this
problem.

----- Forwarded message from Michael-Luke Jones <jonesml@fastmail.to> -----

To: rmk@arm.linux.org.uk
From: Michael-Luke Jones <jonesml@fastmail.to>
Subject: Issue with arm-devel tree
Date: Sat, 12 Jan 2008 14:23:44 +0000

http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/arm:devel.mbox

contains two patches:

"Re: [ARM] remove duplicate includes" from Lucas Woods  
<woodzy@gmail.com>
"Re: [ARM] ixp4xx: remove double include" from Andre Haupt  
<andre@bitwigglers.org>

which between the two of them manage to delete *both* instances of  
#include <linux/reboot.h> in nslu2-power.c

Given that nslu2-power.c calls machine_power_off() and ctrl_alt_del()  
this probably isn't a good thing.

Michael-Luke Jones

----- End forwarded message -----

-- 
Russell King

             reply	other threads:[~2008-01-12 14:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-12 14:54 Russell King [this message]
2008-01-14 13:09 ` Andre Haupt

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=20080112145449.GA11341@flint.arm.linux.org.uk \
    --to=rmk@arm.linux.org.uk \
    --cc=akpm@linux-foundation.org \
    --cc=andre@bitwigglers.org \
    --cc=jonesml@fastmail.to \
    --cc=linux-kernel@vger.kernel.org \
    --cc=woodzy@gmail.com \
    --subject='Re: Fwd: Issue with arm-devel tree' \
    /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

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