[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100515093908.54290762.akpm@linux-foundation.org>
Date: Sat, 15 May 2010 09:39:08 -0400
From: Andrew Morton <akpm@...ux-foundation.org>
To: Stefani Seibold <stefani@...bold.net>
Cc: linux-kernel@...r.kernel.org, andi@...stfloor.org, gregkh@...e.de,
alan@...rguk.ukuu.org.uk, tytso@....edu, iws@...o.caltech.edu
Subject: Re: [PATCH 4/4] add example files to the kernel sample directory
On Sat, 15 May 2010 15:33:38 +0200 Stefani Seibold <stefani@...bold.net> wrote:
> Hi,
>
> is the patch 0003-replace-the-old-non-generic-API.patch correct applied?
>
> This patch renames the files created by patch
>
> 0002-add-the-new-generic-kfifo-API.patch
>
> from
> kernel/kfifo-new.c into kernel/kfifo.c
> and
> include/linux/kfifo-new.h into include/linux/kfifo.h.
>
> Both destination files still exists, so git must overwrite them.
oh, doh, no. This stuff:
: diff --git a/include/linux/kfifo-new.h b/include/linux/kfifo.h
: similarity index 100%
: rename from include/linux/kfifo-new.h
: rename to include/linux/kfifo.h
: diff --git a/kernel/kfifo-new.c b/kernel/kfifo.c
: similarity index 100%
: rename from kernel/kfifo-new.c
: rename to kernel/kfifo.c
is git-specific and doesn't mean anything to patch(1). I'll fix it.
> This
> was done in request by Greg, not to break the kernel build at this point
> in the patch sequence.
Well, there can be no build problem here (joining two
non-build-breaking patches will yield a non-build-breaking patch!) but
if the add-new-api and replace-old-api patches were folded into a
single patch, the diff would be quite unreadable.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists