Skip to contentSkip to conversation

xen-netfront driver updates for 2.6.36

GIT PULL Jeremy Fitzhardinge 2 participants 3 messages Aug 3, 2010 – Aug 4, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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(-)
maintainer
#1 lore raw

From: Jeremy Fitzhardinge <[email protected]>
Date: Tue, 03 Aug 2010 11:39:45 -0700

Quoted 8 lines

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.

#2 lore raw
Quoted 9 lines · David Miller

From: Jeremy Fitzhardinge<[email protected]>
Date: Tue, 03 Aug 2010 11:39:45 -0700

Quoted 6 lines

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).

Quoted 7 lines
Quoted 2 lines

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.

Quoted 3 lines

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.

Quoted 3 lines

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