public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox•com>
To: "Kok, Auke" <auke-jan.h.kok@intel•com>
Cc: netdev@vger•kernel.org, "Brandeburg,
	Jesse" <jesse.brandeburg@intel•com>,
	"Kok, Auke" <auke@foo-projects•org>,
	"Ronciak, John" <john.ronciak@intel•com>
Subject: Re: [PATCH 0/8] partial resend: e1000 fixes and updates
Date: Thu, 18 Jan 2007 11:56:04 -0500	[thread overview]
Message-ID: <45AFA6A4.4090503@pobox.com> (raw)
In-Reply-To: <20070113003650.16816.34076.stgit@gitlost.site>

Kok, Auke wrote:
> Hi,
> 
> This patch series contains exclusively fixes for e1000. Some of these patches were
> already sent in december, but didn't make it into any usptream tree yet. Most
> importantly, it addresses two issues in the recently merged msi interrupt
> handler and dynamic itr code. A performance fix and some minor cleanups are also
> added. This brings the driver up to version 7.3.20-k2.
> 
> The summary below lists all patches. Once that were previously acked are annotated
> with (*)
> 
> These patches apply against netdev-2.6 #upstream-linus commit
> 77aab8bf22042d1658d4adbca8b71779e7f2d0ff. Please pull:
> 
> git pull git://lost.foo-projects.org/~ahkok/git/netdev-2.6 upstream-linus

Sigh.  I /know/ I've told you this before, but let's review the branches 
again.  NEVER EVER use branch 'upstream-linus'.  That is for Linus only.

There are three branches you should care about:

master			Vanilla upstream Linus tree, as of my last pull
upstream-fixes		netdev fixes being sent to Linus for -rc
upstream		Everything else pending, but not yet merged

The decision tree is as follows:

* If there are no dependent e1000 changes, send patches against master 
(or torvalds/linux-2.6.git, if you prefer)
* If there are dependent e1000 changes in #upstream-fixes, send patches 
against #upstream-fixes
* If there are dependent e1000 changes in #upstream, send patches 
against #upstream

In the current tree there are no e1000 changes, so please regenerate 
your tree against vanilla linux-2.6.git and resubmit.

I ACK patches 1-8.

	Jeff





  parent reply	other threads:[~2007-01-18 16:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-13  0:36 [PATCH 0/8] partial resend: e1000 fixes and updates Kok, Auke
2007-01-13  0:37 ` [PATCH 1/8] e1000: simplify case handling gigabit at half duplex Kok, Auke
2007-01-13  0:37 ` [PATCH 2/8] e1000: clean up debug output defines Kok, Auke
2007-01-13  0:37 ` [PATCH 3/8] e1000: Fix MSI only interrupt handler routine Kok, Auke
2007-01-13  0:37 ` [PATCH 4/8] e1000: fix NAPI performance on 4-port adapters Kok, Auke
2007-01-13  0:37 ` [PATCH 5/8] e1000: display flow control of link status at link up Kok, Auke
2007-01-13  0:37 ` [PATCH 6/8] e1000: clear ip csum info from context descriptor Kok, Auke
2007-01-13  0:37 ` [PATCH 7/8] e1000: tune our dynamic itr transmit packet accounting Kok, Auke
2007-01-13  0:37 ` [PATCH 8/8] e1000: update version to 7.3.20-k2 Kok, Auke
2007-01-18 16:56 ` Jeff Garzik [this message]
2007-01-18 17:16   ` [PATCH 0/8] partial resend: e1000 fixes and updates Auke Kok
2007-01-23 21:31     ` Jeff Garzik

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=45AFA6A4.4090503@pobox.com \
    --to=jgarzik@pobox$(echo .)com \
    --cc=auke-jan.h.kok@intel$(echo .)com \
    --cc=auke@foo-projects$(echo .)org \
    --cc=jesse.brandeburg@intel$(echo .)com \
    --cc=john.ronciak@intel$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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