From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.arm.linux.org.uk,
linux-omap@vger.kernel.org
Subject: Re: [PATCH 05/10] omap mailbox: fix empty struct device for omap1
Date: Wed, 28 Jan 2009 17:50:43 +0000 [thread overview]
Message-ID: <20090128175043.GB23301@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20090128.172951.193700554.Hiroshi.DOYU@nokia.com>
On Wed, Jan 28, 2009 at 05:29:51PM +0200, Hiroshi DOYU wrote:
> diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> index 44e9101..af32db0 100644
> --- a/arch/arm/mach-omap2/mailbox.c
> +++ b/arch/arm/mach-omap2/mailbox.c
> @@ -14,7 +14,9 @@
> #include <linux/clk.h>
> #include <linux/err.h>
> #include <linux/platform_device.h>
> -#include <linux/io.h>
> +
> +#include <asm/io.h>
> +
NAK.
> diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
> index 59abbf3..92a90be 100644
> --- a/arch/arm/mach-omap1/mailbox.c
> +++ b/arch/arm/mach-omap1/mailbox.c
> @@ -1,7 +1,7 @@
> /*
> * Mailbox reservation modules for DSP
> *
> - * Copyright (C) 2006 Nokia Corporation
> + * Copyright (C) 2006-2009 Nokia Corporation
> * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
> *
> * This file is subject to the terms and conditions of the GNU General Public
> @@ -13,7 +13,9 @@
> #include <linux/resource.h>
> #include <linux/interrupt.h>
> #include <linux/platform_device.h>
> -#include <linux/io.h>
> +
> +#include <asm/io.h>
> +
NAK.
See fced80c735941fa518ac67c0b61bbe153fb8c050.
The above can not be explained by a mis-merge - they are not a mere
reversion of the above change. They look like a purposeful change
back to the wrong include file.
Can someone please work out why this has happened and what needs to
be done to prevent it happening in the future.
next prev parent reply other threads:[~2009-01-28 17:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-16 8:27 [PATCH 00/10] arm: omap mailbox: add omap3 support with some fixes Hiroshi DOYU
2009-01-16 8:27 ` [PATCH 01/10] omap mailbox: cleanup omap2 register definition with macro Hiroshi DOYU
2009-01-16 9:56 ` roel kluin
2009-01-16 12:15 ` Hiroshi DOYU
2009-01-16 13:21 ` Hiroshi DOYU
2009-01-16 8:27 ` [PATCH 02/10] omap mailbox: add initial omap3 support Hiroshi DOYU
2009-01-16 15:43 ` Felipe Balbi
2009-01-16 8:27 ` [PATCH 03/10] omap mailbox: print hardware revision at startup Hiroshi DOYU
2009-01-16 8:27 ` [PATCH 04/10] omap mailbox: fix empty struct device for omap_mbox Hiroshi DOYU
2009-01-16 8:27 ` [PATCH 05/10] omap mailbox: fix empty struct device for omap1 Hiroshi DOYU
2009-01-28 14:49 ` Russell King - ARM Linux
2009-01-28 15:29 ` Hiroshi DOYU
2009-01-28 17:50 ` Russell King - ARM Linux [this message]
2009-01-28 19:21 ` Hiroshi DOYU
2009-01-28 19:41 ` Russell King - ARM Linux
2009-01-16 8:27 ` [PATCH 06/10] omap mailbox: fix empty struct device for omap2 Hiroshi DOYU
2009-01-16 8:27 ` [PATCH 07/10] omap mailbox: add save_/restore_ctx() for PM Hiroshi DOYU
2009-01-17 17:10 ` Russell King - ARM Linux
2009-01-17 17:20 ` Russell King - ARM Linux
2009-01-19 10:36 ` Hiroshi DOYU
2009-01-19 22:00 ` Russell King - ARM Linux
2009-01-16 8:27 ` [PATCH 08/10] omap mailbox: move mailbox.h into mailbox.c Hiroshi DOYU
2009-01-16 8:27 ` [PATCH 09/10] omap mailbox: convert sequence bit checking to module paramter Hiroshi DOYU
2009-01-16 8:27 ` [PATCH 10/10] omap mailbox: remove unnecessary header file inclusion Hiroshi DOYU
2009-01-30 18:57 ` [PATCH 00/10] arm: omap mailbox: add omap3 support with some fixes Tony Lindgren
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=20090128175043.GB23301@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=Hiroshi.DOYU@nokia.com \
--cc=linux-arm-kernel@lists.arm.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®