From: Auke Kok <auke-jan.h.kok@intel.com>
To: Jeff Garzik <jeff@garzik.org>
Cc: NetDev <netdev@vger.kernel.org>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
"Kok, Auke" <auke@foo-projects.org>
Subject: Re: [FIX] e1000: fix irq sharing when running ethtool test
Date: Fri, 02 Jun 2006 15:32:49 -0700 [thread overview]
Message-ID: <4480BC91.1060402@intel.com> (raw)
In-Reply-To: <20060602222229.GA24528@havoc.gtf.org>
Jeff Garzik wrote:
> On Fri, Jun 02, 2006 at 03:19:47PM -0700, Auke Kok wrote:
>> Because upstream and upstream-fixes have a whitespace conflict in them,
>> I've prepared two separate git branches to pull from so that a subsequent
>> pull or merge from upstream-fixes into upstream doesn't resolve into a
>> conflict:
>
> That won't work, because it creates duplicate changesets in the history.
>
> I'll pull the upstream-fixes version, and then merge into #upstream.
thanks, I wish I had thought of that first!
Auke
prev parent reply other threads:[~2006-06-02 22:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-02 22:19 [FIX] e1000: fix irq sharing when running ethtool test Auke Kok
2006-06-02 22:22 ` Jeff Garzik
2006-06-02 22:32 ` Auke Kok [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=4480BC91.1060402@intel.com \
--to=auke-jan.h.kok@intel.com \
--cc=auke@foo-projects.org \
--cc=jeff@garzik.org \
--cc=jesse.brandeburg@intel.com \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).