From: David Miller <davem@davemloft.net>
To: James.Bottomley@suse.de
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: Re: bug fix patch lost: git problem or just incorrect merge?
Date: Fri, 21 May 2010 15:02:53 -0700 (PDT) [thread overview]
Message-ID: <20100521.150253.149682718.davem@davemloft.net> (raw)
In-Reply-To: <1274456515.9022.14.camel@mulgrave.site>
From: James Bottomley <James.Bottomley@suse.de>
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.
prev parent reply other threads:[~2010-05-21 22:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 15:41 bug fix patch lost: git problem or just incorrect merge? James Bottomley
2010-05-21 16:45 ` Linus Torvalds
2010-05-21 17:04 ` Linus Torvalds
2010-05-21 17:23 ` James Bottomley
2010-05-21 22:07 ` David Miller
2010-05-21 22:02 ` David Miller [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=20100521.150253.149682718.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=James.Bottomley@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=torvalds@linux-foundation.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