Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753187AbZA1RvM (ORCPT ); Wed, 28 Jan 2009 12:51:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751354AbZA1Ru4 (ORCPT ); Wed, 28 Jan 2009 12:50:56 -0500 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:45077 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325AbZA1Ruz (ORCPT ); Wed, 28 Jan 2009 12:50:55 -0500 Date: Wed, 28 Jan 2009 17:50:43 +0000 From: Russell King - ARM Linux To: Hiroshi DOYU 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 Message-ID: <20090128175043.GB23301@n2100.arm.linux.org.uk> References: <20090116081919.17571.34378.stgit@oreo.research.nokia.com> <20090116082727.17571.87307.stgit@oreo.research.nokia.com> <20090128144955.GA23089@n2100.arm.linux.org.uk> <20090128.172951.193700554.Hiroshi.DOYU@nokia.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090128.172951.193700554.Hiroshi.DOYU@nokia.com> User-Agent: Mutt/1.4.2.1i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1670 Lines: 53 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 > #include > #include > -#include > + > +#include > + 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 > * > * This file is subject to the terms and conditions of the GNU General Public > @@ -13,7 +13,9 @@ > #include > #include > #include > -#include > + > +#include > + 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/