Re: bug fix patch lost: git problem or just incorrect merge?

From: David Miller
Date: Fri May 21 2010 - 18:02:51 EST

Next message: Jesse Barnes: "Re: [RFC] Try a bit harder to get output on the screen at panictime"
Previous message: Ryan Bair: "laptop computer"
In reply to: David Miller: "Re: bug fix patch lost: git problem or just incorrect merge?"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

From: James Bottomley <James.Bottomley@xxxxxxx>
Date: Fri, 21 May 2010 10:41:55 -0500

> Is this a git problem ... or is it just a mismerge in the net tree?

Mismerge, because sk->sk_sleep() doesn't exist any more I mistakenly
updated the original line to do the sk_sleep() stuff.

Sorry about that.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Jesse Barnes: "Re: [RFC] Try a bit harder to get output on the screen at panictime"
Previous message: Ryan Bair: "laptop computer"
In reply to: David Miller: "Re: bug fix patch lost: git problem or just incorrect merge?"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]