[GIT PULL] xen-netfront driver updates for 2.6.36

[GIT PULL] xen-netfront driver updates for 2.6.36

[Jeremy Fitzhardinge]

Hi Dave,

OK, let's try that again.

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?

Thanks,
     J

The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51:

   Linux 2.6.35 (2010-08-01 15:11:14 -0700)

are available in the git repository at:
   git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git 
upstream/netfront

Dongxiao Xu (1):
       xen/netfront: Use smart polling instead of event notification.

Ian Campbell (2):
       xen/rings: make protocol specific usage of shared sring explicit
       xen/netfront: make protocol specific usage of shared sring explicit

  drivers/net/xen-netfront.c      |  114 
++++++++++++++++++++++++++++++++++++++-
  include/xen/interface/io/ring.h |   11 ++++-
  2 files changed, 122 insertions(+), 3 deletions(-)

Re: [GIT PULL] xen-netfront driver updates for 2.6.36

[David Miller]

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.

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.

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.

Thanks.

Re: [GIT PULL] xen-netfront driver updates for 2.6.36

[Jeremy Fitzhardinge]

  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

[GIT PULL] xen-netfront driver updates for 2.6.36

[Jeremy Fitzhardinge]

  Hi Dave,

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.  They've been in 
linux-next for a week or so.

Do you want to take this via the net tree, or are you OK with me 
submitting them directly?

Thanks,
     J

The following changes since commit 74fca6a42863ffacaf7ba6f1936a9f228950f657:

   Linux 2.6.31 (2009-09-09 15:13:59 -0700)

are available in the git repository at:
   git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git upstream/netfront

Dongxiao Xu (1):
       xen/netfront: Use smart polling instead of event notification.

Ian Campbell (2):
       xen/rings: make protocol specific usage of shared sring explicit
       xen/netfront: make protocol specific usage of shared sring explicit

  drivers/net/xen-netfront.c      |  114 ++++++++++++++++++++++++++++++++++++++-
  include/xen/interface/io/ring.h |   11 ++++-
  2 files changed, 122 insertions(+), 3 deletions(-)

Re: [GIT PULL] xen-netfront driver updates for 2.6.36

[Jeremy Fitzhardinge]

  On 08/03/2010 11:11 AM, Jeremy Fitzhardinge wrote:
>  Hi Dave,
>
> 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.  They've been 
> in linux-next for a week or so.

Oops, never mind.

They got left out of linux-next, and they have a merge conflict.  I'll 
sort it out and resubmit.

'Thanks,
     J