From: Jeff Garzik <jgarzik@pobox.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Andrew Morton <akpm@osdl.org>,
Netdev List <netdev@vger.kernel.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [git patches] 2.6.x net driver updates
Date: Sat, 18 Jun 2005 16:04:56 -0400 [thread overview]
Message-ID: <42B47E68.9020601@pobox.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0506181146260.2268@ppc970.osdl.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
next prev parent reply other threads:[~2005-06-18 20:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <42B456E2.8000500@pobox.com>
2005-06-18 17:51 ` [git patches] 2.6.x net driver updates Linus Torvalds
2005-06-18 18:06 ` Linus Torvalds
2005-06-18 18:24 ` Linus Torvalds
2005-06-18 18:36 ` Jeff Garzik
2005-06-18 18:48 ` Linus Torvalds
2005-06-18 20:04 ` Jeff Garzik [this message]
2005-06-18 20:23 ` Linus Torvalds
2006-01-12 22:13 Jeff Garzik
2006-01-12 22:30 ` Linus Torvalds
2006-01-12 22:39 ` Andrew Morton
2006-01-12 22:46 ` Linus Torvalds
2006-01-13 17:56 ` Roman Zippel
2006-01-13 19:23 ` Jens Axboe
2006-01-13 19:28 ` Sam Ravnborg
2006-01-13 19:36 ` Jens Axboe
2006-01-14 2:29 ` Adrian Bunk
2006-01-14 5:05 ` Randy.Dunlap
2006-01-12 22:42 ` Jeff Garzik
2006-01-12 23:14 ` Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2006-01-09 17:10 Jeff Garzik
2006-01-03 16:41 Jeff Garzik
2005-11-09 6:53 Jeff Garzik
2005-11-05 19:58 Jeff Garzik
2005-10-29 18:21 Jeff Garzik
2005-10-28 0:42 Jeff Garzik
[not found] <4292BA66.8070806@pobox.com>
2005-05-24 6:08 ` Linus Torvalds
2005-05-24 6:25 ` Jeff Garzik
2005-05-24 6:48 ` Linus Torvalds
2005-05-24 7:29 ` Jeff Garzik
2005-05-24 7:46 ` Linus Torvalds
2005-05-24 7:55 ` David Lang
2005-05-24 6:34 ` Jeff Garzik
2005-05-24 6:50 ` Linus Torvalds
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=42B47E68.9020601@pobox.com \
--to=jgarzik@pobox.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=torvalds@osdl.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.