public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Fix collateral damage to top level Makefile
@ 2008-07-17  7:06 Grant Likely
  2008-07-17  7:27 ` Paul Mundt
  2008-07-17 16:01 ` John Rigby
  0 siblings, 2 replies; 6+ messages in thread
From: Grant Likely @ 2008-07-17  7:06 UTC (permalink / raw)
  To: petkovbb, jrigby, linux-kernel, benh, torvalds

From: Grant Likely <grant.likely@secretlab.ca>

The patch named "powerpc/mpc5121: Add clock driver", also contained
an unrelated and bogus change to the top-level makefile.  This patch
backs out the bad bit.

SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5)

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

If the maintainer who picked up this patch (Grant Likely) had done
his job, this cack-up never would have happened.  Why do we still
have to deal with such sloppy individuals?

Ben/Linus;  I assume one of you will want to pick this up soonish?
Otherwise, I'll add it to my tree and it will be part of my next
pull request.

g.

 Makefile |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 1564577..6192922 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-FRED=42
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 26


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix collateral damage to top level Makefile
  2008-07-17  7:06 [PATCH] Fix collateral damage to top level Makefile Grant Likely
@ 2008-07-17  7:27 ` Paul Mundt
  2008-07-17  8:50   ` Benjamin Herrenschmidt
  2008-07-17 16:01 ` John Rigby
  1 sibling, 1 reply; 6+ messages in thread
From: Paul Mundt @ 2008-07-17  7:27 UTC (permalink / raw)
  To: Grant Likely; +Cc: petkovbb, jrigby, linux-kernel, benh, torvalds

On Thu, Jul 17, 2008 at 01:06:55AM -0600, Grant Likely wrote:
> From: Grant Likely <grant.likely@secretlab.ca>
> 
> The patch named "powerpc/mpc5121: Add clock driver", also contained
> an unrelated and bogus change to the top-level makefile.  This patch
> backs out the bad bit.
> 
> SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5)
> 
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> 
> If the maintainer who picked up this patch (Grant Likely) had done
> his job, this cack-up never would have happened.  Why do we still
> have to deal with such sloppy individuals?
> 
I think the more important question is why the hell would anyone put that
in a Makefile, ever? ;-)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix collateral damage to top level Makefile
  2008-07-17  7:27 ` Paul Mundt
@ 2008-07-17  8:50   ` Benjamin Herrenschmidt
  2008-07-17  9:49     ` Boris Petkov
  0 siblings, 1 reply; 6+ messages in thread
From: Benjamin Herrenschmidt @ 2008-07-17  8:50 UTC (permalink / raw)
  To: Paul Mundt; +Cc: Grant Likely, petkovbb, jrigby, linux-kernel, torvalds

On Thu, 2008-07-17 at 16:27 +0900, Paul Mundt wrote:
> On Thu, Jul 17, 2008 at 01:06:55AM -0600, Grant Likely wrote:
> > From: Grant Likely <grant.likely@secretlab.ca>
> > 
> > The patch named "powerpc/mpc5121: Add clock driver", also contained
> > an unrelated and bogus change to the top-level makefile.  This patch
> > backs out the bad bit.
> > 
> > SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5)
> > 
> > Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> > ---
> > 
> > If the maintainer who picked up this patch (Grant Likely) had done
> > his job, this cack-up never would have happened.  Why do we still
> > have to deal with such sloppy individuals?
> > 
> I think the more important question is why the hell would anyone put that
> in a Makefile, ever? ;-)

Well, it's partially my fault for not spotting it when pulling in
Grant's git and pushing out to Linus.

Anyway, it's a mistake, shit happens, I doubt Grant will do that one
twice :-)

Cheers,
Ben.



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix collateral damage to top level Makefile
  2008-07-17  8:50   ` Benjamin Herrenschmidt
@ 2008-07-17  9:49     ` Boris Petkov
  2008-07-17 15:11       ` Grant Likely
  0 siblings, 1 reply; 6+ messages in thread
From: Boris Petkov @ 2008-07-17  9:49 UTC (permalink / raw)
  To: benh; +Cc: Paul Mundt, Grant Likely, jrigby, linux-kernel, torvalds

On Thu, Jul 17, 2008 at 10:50 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> On Thu, 2008-07-17 at 16:27 +0900, Paul Mundt wrote:
>> On Thu, Jul 17, 2008 at 01:06:55AM -0600, Grant Likely wrote:
>> > From: Grant Likely <grant.likely@secretlab.ca>
>> >
>> > The patch named "powerpc/mpc5121: Add clock driver", also contained
>> > an unrelated and bogus change to the top-level makefile.  This patch
>> > backs out the bad bit.
>> >
>> > SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5)
>> >
>> > Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>> > ---
>> >
>> > If the maintainer who picked up this patch (Grant Likely) had done
>> > his job, this cack-up never would have happened.  Why do we still
>> > have to deal with such sloppy individuals?
>> >
>> I think the more important question is why the hell would anyone put that
>> in a Makefile, ever? ;-)
>
> Well, it's partially my fault for not spotting it when pulling in
> Grant's git and pushing out to Linus.
>
> Anyway, it's a mistake, shit happens, I doubt Grant will do that one
> twice :-)

Oh come on, don't scare the guy more than he is - now he'll be staring
frantically at each +-diff line before submitting :). And it's not like it's the
end of the world, it's just that Fred has turned 42 or similar :)

P.S. If I only knew how such an innocent thing would destroy a man's
life i never would've
reported it in the first place :). Sorry Grant.

-- 
Regards/Gruß,
Boris

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix collateral damage to top level Makefile
  2008-07-17  9:49     ` Boris Petkov
@ 2008-07-17 15:11       ` Grant Likely
  0 siblings, 0 replies; 6+ messages in thread
From: Grant Likely @ 2008-07-17 15:11 UTC (permalink / raw)
  To: petkovbb; +Cc: benh, Paul Mundt, jrigby, linux-kernel, torvalds

On Thu, Jul 17, 2008 at 11:49:30AM +0200, Boris Petkov wrote:
> On Thu, Jul 17, 2008 at 10:50 AM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
> > On Thu, 2008-07-17 at 16:27 +0900, Paul Mundt wrote:
> >> On Thu, Jul 17, 2008 at 01:06:55AM -0600, Grant Likely wrote:
> > Well, it's partially my fault for not spotting it when pulling in
> > Grant's git and pushing out to Linus.
> >
> > Anyway, it's a mistake, shit happens, I doubt Grant will do that one
> > twice :-)
> 
> Oh come on, don't scare the guy more than he is - now he'll be staring
> frantically at each +-diff line before submitting :). And it's not like it's the
> end of the world, it's just that Fred has turned 42 or similar :)
> 
> P.S. If I only knew how such an innocent thing would destroy a man's
> life i never would've
> reported it in the first place :). Sorry Grant.

Heh, oh please, I've got a thicker skin that that.  I appreciate the
error being pointed out.

But Ben's right.  That mistake will not happen again!  :-)

Cheers,
g.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix collateral damage to top level Makefile
  2008-07-17  7:06 [PATCH] Fix collateral damage to top level Makefile Grant Likely
  2008-07-17  7:27 ` Paul Mundt
@ 2008-07-17 16:01 ` John Rigby
  1 sibling, 0 replies; 6+ messages in thread
From: John Rigby @ 2008-07-17 16:01 UTC (permalink / raw)
  To: Grant Likely; +Cc: petkovbb, linux-kernel, benh, torvalds

Grant,

I owe you on this one.  Sorry.

John

Grant Likely wrote:
> From: Grant Likely <grant.likely@secretlab.ca>
>
> The patch named "powerpc/mpc5121: Add clock driver", also contained
> an unrelated and bogus change to the top-level makefile.  This patch
> backs out the bad bit.
>
> SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5)
>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> ---
>
> If the maintainer who picked up this patch (Grant Likely) had done
> his job, this cack-up never would have happened.  Why do we still
> have to deal with such sloppy individuals?
>
> Ben/Linus;  I assume one of you will want to pick this up soonish?
> Otherwise, I'll add it to my tree and it will be part of my next
> pull request.
>
> g.
>
>  Makefile |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 1564577..6192922 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,4 +1,3 @@
> -FRED=42
>  VERSION = 2
>  PATCHLEVEL = 6
>  SUBLEVEL = 26
>
>
>   


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-07-17 16:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-17  7:06 [PATCH] Fix collateral damage to top level Makefile Grant Likely
2008-07-17  7:27 ` Paul Mundt
2008-07-17  8:50   ` Benjamin Herrenschmidt
2008-07-17  9:49     ` Boris Petkov
2008-07-17 15:11       ` Grant Likely
2008-07-17 16:01 ` John Rigby

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox