From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262162AbVFRUFG (ORCPT ); Sat, 18 Jun 2005 16:05:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262171AbVFRUFG (ORCPT ); Sat, 18 Jun 2005 16:05:06 -0400 Received: from mail.dvmed.net ([216.237.124.58]:28307 "EHLO mail.dvmed.net") by vger.kernel.org with ESMTP id S261468AbVFRUE7 (ORCPT ); Sat, 18 Jun 2005 16:04:59 -0400 Message-ID: <42B47E68.9020601@pobox.com> Date: Sat, 18 Jun 2005 16:04:56 -0400 From: Jeff Garzik User-Agent: Mozilla Thunderbird 1.0.2-6 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Linus Torvalds CC: Andrew Morton , Netdev List , Linux Kernel Subject: Re: [git patches] 2.6.x net driver updates References: <42B456E2.8000500@pobox.com> <42B469B6.2060502@pobox.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds wrote: > Ok, I ended up re-doing the merge by hand (ie I fetched all the other > parts, ignored your top entry, and just merged the previous one manually). > > I'm pushing out the result now, can you verify that the r8192.c file looks > like you expected it to look? I think it should be the same thing you > ended up with except for fixed parents, but... Looks good here, thanks. I re-did the merge locally, as a test, finalizing with 'git commit' rather than 'git-commit-tree ...' and the parent info came out correct. FWIW. Jeff