public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: David Miller <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	Xen-devel@lists.xensource.com, dongxiao.xu@intel.com
Subject: Re: [GIT PULL] xen-netfront driver updates for 2.6.36
Date: Tue, 03 Aug 2010 17:49:46 -0700	[thread overview]
Message-ID: <4C58B92A.4090605@goop.org> (raw)
In-Reply-To: <20100803.163700.71134702.davem@davemloft.net>

  On 08/03/2010 04:37 PM, David Miller wrote:
> From: Jeremy Fitzhardinge<jeremy@goop.org>
> Date: Tue, 03 Aug 2010 11:39:45 -0700
>
>> Here's a git branch with some updates to the Xen netfront driver,
>> which add a new "smartpoll" mode to the netfront backend protocol,
>> which is basically equivalent to interrupt mitigation.  This merges
>> cleanly with current linux-next (it previously just had a small
>> constification conflict).
>>
>> Do you want to take this via the net tree, or are you OK with me
>> submitting them directly?
> Well from my perspective:
>
> 1) It's too late to put into my tree because the merge window has
>     already started.  If you want me to include this you should have
>     asked me to pull it in days if not weeks ago.

OK, there's no particular rush.

> 2) Your tree is absolutely not in a state I can pull it.  It has lots
>     of completely unrelated commits which are not in net-next-2.6 which
>     in no way should I be pulling into my tree.

It's based on v2.6.35.  I can rebase to net-next-2.6.

> When you want me to take changes, your tree should be based upon mine.
> And when I pull from your tree I should get only your specific
> xen-netfront driver changes, and nothing more.

Sure.

Thanks,
     J

  reply	other threads:[~2010-08-04  0:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-03 18:39 [GIT PULL] xen-netfront driver updates for 2.6.36 Jeremy Fitzhardinge
2010-08-03 23:37 ` David Miller
2010-08-04  0:49   ` Jeremy Fitzhardinge [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-08-03 18:11 Jeremy Fitzhardinge
2010-08-03 18:12 ` Jeremy Fitzhardinge

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=4C58B92A.4090605@goop.org \
    --to=jeremy@goop.org \
    --cc=Xen-devel@lists.xensource.com \
    --cc=davem@davemloft.net \
    --cc=dongxiao.xu@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --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