[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20080611084953.GG6701@shadowen.org>
Date: Wed, 11 Jun 2008 09:49:53 +0100
From: Andy Whitcroft <apw@...dowen.org>
To: Greg KH <greg@...ah.com>
Cc: David Woodhouse <dwmw2@...radead.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
linux-usb@...r.kernel.org
Subject: Re: update checkpatch.pl to version 0.19
On Mon, Jun 09, 2008 at 03:58:43PM -0700, Greg KH wrote:
> On Mon, Jun 09, 2008 at 12:09:41PM +0100, David Woodhouse wrote:
> > On Mon, 2008-06-09 at 09:33 +0100, Andy Whitcroft wrote:
> > > The issue I have is I have a comprehensive test suite which is kept in
> > > lock step with checkpatch itself, all in my own tree. Now that is
> > > just noise for mainline. What I want to be able to do is keep that in
> > > lock step with developments in my tree, but not merge it upstream. So
> > > far I've not found a workable solution with git for that.
> >
> > Why not make a tree which automatically tracks Linus' tree but only
> > includes checkpatch.pl. Then pull from that into your own tree before
> > you push your changes back.
>
> Or just use quilt. Or git. Or something that takes into account that
> your file will change in the mainline tree.
>
> Keeping code outside the kernel tree and then blindly doing a diff to
> generate a patch for submission is never considered a good idea, and
> causes real problems, as seen here.
Indeed, and I am using git. It is the fact that the surrounding test
suite is not submitted that means I need to work in a separate tree. I
have since this incident looked back over the history and yours was the
only change that did not come through me and so the problem has been
restricted to that one change.
But to prevent it occuring again I have rejigged my tree so that I can
simply maintain a real git branch for just the checkpatch changes, in
parallel to the version with the tests. This then allows me to merge
mainline and handle things correctly.
-apw
--
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