public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: David Howells <dhowells@redhat.com>
Cc: torvalds@osdl.org, akpm@linux-foundation.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] FRV: Fix interaction with new generic header stuff
Date: Sat, 13 Jun 2009 22:31:48 +0200	[thread overview]
Message-ID: <200906132231.49327.arnd@arndb.de> (raw)
In-Reply-To: <20090613122354.24795.88926.stgit@warthog.procyon.org.uk>

On Saturday 13 June 2009, David Howells wrote:
> Fix interaction with new generic header stuff as added by:
> 
>         commit 6103ec56c65c33774c7c38652c8204120c3c7519
>         Author: Arnd Bergmann <arnd@arndb.de>
>         Date:   Wed May 13 22:56:27 2009 +0000
> 
>             asm-generic: add generic ABI headers
> 
> The problem is that asm/signal.h has been made to include asm-generic/signal.h,
> but the redundant stuff from asm/signal.h has not been discarded, leading to
> multiple redefinitions.
> 
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: David Howells <dhowells@redhat.com>

Acked-by: Arnd Bergmann <arnd@arndb.de>

This was the result of an incorrectly resolved merge conflict on my side,
after you moved the frv headers around. I fixed the same bug for other
architectures, but frv has slipped through for some reason.

My intended fix was to simply change #include <asm-generic/signal.h>
to #include <asm-generic/signal-defs.h>, which would have been guaranteed
to be non-invasive. Your change of course is the long-term cleanup
that reuses the asm-generic file.

Sorry about the breakage.

	Arnd <><

      reply	other threads:[~2009-06-13 20:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-13 12:23 [PATCH] FRV: Fix interaction with new generic header stuff David Howells
2009-06-13 20:31 ` Arnd Bergmann [this message]

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=200906132231.49327.arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=akpm@linux-foundation.org \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.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