From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: bug fix patch lost: git problem or just incorrect merge? Date: Fri, 21 May 2010 15:07:17 -0700 (PDT) Message-ID: <20100521.150717.157502983.davem@davemloft.net> References: <1274456515.9022.14.camel@mulgrave.site> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: James.Bottomley@suse.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-scsi@vger.kernel.org To: torvalds@linux-foundation.org Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Linus Torvalds Date: Fri, 21 May 2010 09:45:49 -0700 (PDT) > One of the reasons I ask people to let me merge is that it results in > cleaner history to not have criss-cross merges. And another is that I'm > pretty good at it, and letting me make merges also means that I am more > aware of problem spots. That wasn't possible in this case. This happened more than a week ago, as I needed to merge your tree into net-2.6 to resolve a conflict there. That's what took in the iscsi bug fix, and this is way before the merge window. Then I needed to pull net-2.6 into net-next-2.6 to resolve conflicts existing between those two trees. And this is why I ended up having to do the merge :-) >> Either way, of course, we need the patch back ... > > I'll fix it up. Thanks Linus.