linux-next: manual merge of the net tree with the tree

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/virtio_net.c between commit
4783256ef92f5aecd6d54693b16386f2a0021c2a ("virtio_net: Make virtio_net
support carrier detection") from the net-current tree and commit
9f4d26d0f3016cf8813977d624751b94465fa317 ("virtio_net: add link status
handling") from the net tree.

I think that the latter patch means that the former is not needed, so I
used the version from the net tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the net tree with the tree

[Pantelis Koukousoulas]

On Fri, Mar 20, 2009 at 2:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi David,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/virtio_net.c between commit
> 4783256ef92f5aecd6d54693b16386f2a0021c2a ("virtio_net: Make virtio_net
> support carrier detection") from the net-current tree and commit
> 9f4d26d0f3016cf8813977d624751b94465fa317 ("virtio_net: add link status
> handling") from the net tree.
>
> I think that the latter patch means that the former is not needed, so I
> used the version from the net tree.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>

Hi,

The correct merge is so that the conflicting part becomes like this:

+       /* If we have no carrier info, the answer is "always on". */
       vi->status = VIRTIO_NET_S_LINK_UP;
+       netif_carrier_on(vi->dev);

I.e., you need to keep this netif_carrier_on(vi->dev) to maintain
useful behavior
for current/older versions of qemu that don't support link handling (because
in this case VIRTIO_NET_S_LINK_UP will not cause netif_carrier_on to
be called).

Thanks,
Pantelis

Re: linux-next: manual merge of the net tree with the tree

[Mark McLoughlin]

Hi Pantelis,

On Fri, 2009-03-20 at 06:38 +0200, Pantelis Koukousoulas wrote:
> On Fri, Mar 20, 2009 at 2:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi David,
> >
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/virtio_net.c between commit
> > 4783256ef92f5aecd6d54693b16386f2a0021c2a ("virtio_net: Make virtio_net
> > support carrier detection") from the net-current tree and commit
> > 9f4d26d0f3016cf8813977d624751b94465fa317 ("virtio_net: add link status
> > handling") from the net tree.
> >
> > I think that the latter patch means that the former is not needed, so I
> > used the version from the net tree.
> > --
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> > http://www.canb.auug.org.au/~sfr/
> >
> 
> Hi,
> 
> The correct merge is so that the conflicting part becomes like this:
> 
> +       /* If we have no carrier info, the answer is "always on". */
>        vi->status = VIRTIO_NET_S_LINK_UP;
> +       netif_carrier_on(vi->dev);
> 
> I.e., you need to keep this netif_carrier_on(vi->dev) to maintain
> useful behavior
> for current/older versions of qemu that don't support link handling (because
> in this case VIRTIO_NET_S_LINK_UP will not cause netif_carrier_on to
> be called).

(Sorry, I missed the original discussion while on vacation)

The merge resolution looks fine ... although netif_carrier_on() isn't
really needed (it's the default) and, also, it's unusual to add a
comment in a merge resolution.

Probably best for davem to merge net-2.6 into net-next-2.6 in order to
sort it out.

Cheers,
Mark.

Re: linux-next: manual merge of the net tree with the tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Mar 2009 11:32:42 +1100

> Hi David,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/virtio_net.c between commit
> 4783256ef92f5aecd6d54693b16386f2a0021c2a ("virtio_net: Make virtio_net
> support carrier detection") from the net-current tree and commit
> 9f4d26d0f3016cf8813977d624751b94465fa317 ("virtio_net: add link status
> handling") from the net tree.
> 
> I think that the latter patch means that the former is not needed, so I
> used the version from the net tree.

I've taken care of this merge conflict, thanks Stephen.

Re: linux-next: manual merge of the net tree with the tree

[Niklaus Giger]

> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8
> ("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit
> 3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.
> 
> The former commit removes the file, so I just did that.
Thanks!

Best regards

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8
("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit
3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.

The former commit removes the file, so I just did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8
("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit
3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.

The former commit removes the file, so I just did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/sky2.c between
commit1d3c16a818e992c199844954d95c17fd7ce6cbba  ("PCI: make
pci_restore_state return void") from the  tree and commit
0f333d10e3f689640b229c8cf00b16ea51ce4951 ("sky2: Do not use legacy PCI
power management") from the net tree.

The latter removes the code that the former modifies.  I used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/sky2.c between
commit1d3c16a818e992c199844954d95c17fd7ce6cbba  ("PCI: make
pci_restore_state return void") from the  tree and commit
0f333d10e3f689640b229c8cf00b16ea51ce4951 ("sky2: Do not use legacy PCI
power management") from the net tree.

The latter removes the code that the former modifies.  I used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the net tree with the tree

[Stefan Richter]

Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the net tree got a conflict in
>> drivers/ieee1394/eth1394.c between commit
>> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
>> 1394 driver stack") from the  tree and commit
>                                ^
> I meant to say "the ieee1394 tree".

(I should have put the ieee1394 removal into -next much earlier.  OTOH the
conflicting commit is from August 17 already...)

Would it be useful if I rebase this small ieee1394 removal branch of mine onto
net?
-- 
Stefan Richter
-=====-==-=- =-=- -==--
http://arcgraph.de/sr/

Re: linux-next: manual merge of the net tree with the tree

[Stefan Richter]

Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the net tree got a conflict in
>> drivers/ieee1394/eth1394.c between commit
>> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
>> 1394 driver stack") from the  tree and commit
>                                ^
> I meant to say "the ieee1394 tree".

(I should have put the ieee1394 removal into -next much earlier.  OTOH the
conflicting commit is from August 17 already...)

Would it be useful if I rebase this small ieee1394 removal branch of mine onto
net?
-- 
Stefan Richter
-=====-==-=- =-=- -==--
http://arcgraph.de/sr/

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb

Re: linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

Hi all,

On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/ieee1394/eth1394.c between commit
> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
> 1394 driver stack") from the  tree and commit
                               ^
I meant to say "the ieee1394 tree".

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

Hi all,

On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/ieee1394/eth1394.c between commit
> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
> 1394 driver stack") from the  tree and commit
                               ^
I meant to say "the ieee1394 tree".

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/ieee1394/eth1394.c between commit
66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
1394 driver stack") from the  tree and commit
01414802054c382072b6cb9a1bdc6e243c74b2d5 ("ethtool: Provide a default
implementation of ethtool_ops::get_drvinfo") from the net tree.

The former removes the file.  I just did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/ieee1394/eth1394.c between commit
66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
1394 driver stack") from the  tree and commit
01414802054c382072b6cb9a1bdc6e243c74b2d5 ("ethtool: Provide a default
implementation of ethtool_ops::get_drvinfo") from the net tree.

The former removes the file.  I just did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/orinoco/main.c between commit
240c102d9c54fee7fdc87a4ef2fabc7eb539e00a ("netdev: restore MAC address
set and validate operations") from the net-current tree and
commit5381956b780e82805247c2ec8e32c4c665309394 ("orinoco: move netdev
interface creation to main driver") from the net tree.

Just overlapping removals.  I fixed it up and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the net tree with the tree

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 21 May 2009 20:35:47 -0400

> I think what Stephen has done is good for now.  I'll probably post
> a pull request for wireless-next-2.6 tommorrow.

Ok.

Once I pull that in I'll pull net-2.6 into net-next-2.6 to resolve
all of the merge issues fully.

Re: linux-next: manual merge of the net tree with the tree

[John W. Linville]

On Thu, May 21, 2009 at 03:29:10PM -0700, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Thu, 21 May 2009 15:25:11 -0700 (PDT)
> 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 21 May 2009 14:06:10 +1000
> > 
> >> Today's linux-next merge of the net tree got a conflict in
> >> drivers/net/wireless/iwlwifi/iwl-agn.c
> >> drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
> >> fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
> >> work inside spin_lock_irqsave") from the wireless-current tree and commit
> >> 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
> >> 3945") from the net tree.
> >> 
> >> I removed iwl{3945,}_set_mode() from and applied the following patch.
> > 
> > I'll sort this out right now, thanks Stephen.
> 
> Sorry, I misread this.  The conflict is created by the
> wireless-current tree so it seems something John has to
> sort out unless I've pulled that work into net-next-2.6 already.
> 
> John which is it?

I think what Stephen has done is good for now.  I'll probably post
a pull request for wireless-next-2.6 tommorrow.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: manual merge of the net tree with the tree

[John W. Linville]

On Thu, May 21, 2009 at 03:25:11PM -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 21 May 2009 14:06:10 +1000
> 
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-agn.c
> > drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
> > fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
> > work inside spin_lock_irqsave") from the wireless-current tree and commit
> > 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
> > 3945") from the net tree.
> > 
> > I removed iwl{3945,}_set_mode() from and applied the following patch.
> 
> I'll sort this out right now, thanks Stephen.

wireless-next-2.6 has a merge-test branch for reference.

Hth!

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: manual merge of the net tree with the tree

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Thu, 21 May 2009 15:25:11 -0700 (PDT)

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 21 May 2009 14:06:10 +1000
> 
>> Today's linux-next merge of the net tree got a conflict in
>> drivers/net/wireless/iwlwifi/iwl-agn.c
>> drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
>> fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
>> work inside spin_lock_irqsave") from the wireless-current tree and commit
>> 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
>> 3945") from the net tree.
>> 
>> I removed iwl{3945,}_set_mode() from and applied the following patch.
> 
> I'll sort this out right now, thanks Stephen.

Sorry, I misread this.  The conflict is created by the
wireless-current tree so it seems something John has to
sort out unless I've pulled that work into net-next-2.6 already.

John which is it?

Thanks.

Re: linux-next: manual merge of the net tree with the tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 May 2009 14:06:10 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-agn.c
> drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
> fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
> work inside spin_lock_irqsave") from the wireless-current tree and commit
> 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
> 3945") from the net tree.
> 
> I removed iwl{3945,}_set_mode() from and applied the following patch.

I'll sort this out right now, thanks Stephen.

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
work inside spin_lock_irqsave") from the wireless-current tree and commit
727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
3945") from the net tree.

I removed iwl{3945,}_set_mode() from and applied the following patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 5393fb3..967343a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2437,13 +2437,6 @@ int iwl_set_mode(struct iwl_priv *priv, int mode)
 	if (!iwl_is_ready_rf(priv))
 		return -EAGAIN;
 
-	cancel_delayed_work(&priv->scan_check);
-	if (iwl_scan_cancel_timeout(priv, 100)) {
-		IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
-		IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
-		return -EAGAIN;
-	}
-
 	iwlcore_commit_rxon(priv);
 
 	return 0;

Re: linux-next: manual merge of the net tree with the tree

[Eric Dumazet]

David Miller a écrit :
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 8 May 2009 13:23:52 +1000
> 
>> Today's linux-next merge of the net tree got a conflict in
>> include/net/tcp.h between commit 0c266898b42fe4e4e2f9edfc9d3474c10f93aa6a
>> ("tcp: Fix tcp_prequeue() to get correct rto_min value") from Linus' tree
>> and commit f5f8d86b231e0489c33542c42afbb14d32411ee8 ("tcp: tcp_prequeue()
>> cleanup") from the net tree.
>>
>> I fixed it up (see below - please check) and can carry the fix for a
>> while.
> 
> Thanks Stephen, I'll do a merge to fix this up.
> 
> 

Sorry, I did my patches on top of net-next-2.6, I didnt realize some changes
were in flight on net-2.6

Re: linux-next: manual merge of the net tree with the tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 May 2009 13:23:52 +1000

> Today's linux-next merge of the net tree got a conflict in
> include/net/tcp.h between commit 0c266898b42fe4e4e2f9edfc9d3474c10f93aa6a
> ("tcp: Fix tcp_prequeue() to get correct rto_min value") from Linus' tree
> and commit f5f8d86b231e0489c33542c42afbb14d32411ee8 ("tcp: tcp_prequeue()
> cleanup") from the net tree.
> 
> I fixed it up (see below - please check) and can carry the fix for a
> while.

Thanks Stephen, I'll do a merge to fix this up.

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the net tree got a conflict in
include/net/tcp.h between commit 0c266898b42fe4e4e2f9edfc9d3474c10f93aa6a
("tcp: Fix tcp_prequeue() to get correct rto_min value") from Linus' tree
and commit f5f8d86b231e0489c33542c42afbb14d32411ee8 ("tcp: tcp_prequeue()
cleanup") from the net tree.

I fixed it up (see below - please check) and can carry the fix for a
while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/net/tcp.h
index 646dbe3,87d210b..0000000
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@@ -889,30 -890,32 +902,32 @@@ static inline int tcp_prequeue(struct s
  {
  	struct tcp_sock *tp = tcp_sk(sk);
  
- 	if (!sysctl_tcp_low_latency && tp->ucopy.task) {
- 		__skb_queue_tail(&tp->ucopy.prequeue, skb);
- 		tp->ucopy.memory += skb->truesize;
- 		if (tp->ucopy.memory > sk->sk_rcvbuf) {
- 			struct sk_buff *skb1;
- 
- 			BUG_ON(sock_owned_by_user(sk));
- 
- 			while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
- 				sk_backlog_rcv(sk, skb1);
- 				NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPPREQUEUEDROPPED);
- 			}
- 
- 			tp->ucopy.memory = 0;
- 		} else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
- 			wake_up_interruptible(sk->sk_sleep);
- 			if (!inet_csk_ack_scheduled(sk))
- 				inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
- 						          (3 * tcp_rto_min(sk)) / 4,
- 							  TCP_RTO_MAX);
+ 	if (sysctl_tcp_low_latency || !tp->ucopy.task)
+ 		return 0;
+ 
+ 	__skb_queue_tail(&tp->ucopy.prequeue, skb);
+ 	tp->ucopy.memory += skb->truesize;
+ 	if (tp->ucopy.memory > sk->sk_rcvbuf) {
+ 		struct sk_buff *skb1;
+ 
+ 		BUG_ON(sock_owned_by_user(sk));
+ 
+ 		while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
+ 			sk_backlog_rcv(sk, skb1);
+ 			NET_INC_STATS_BH(sock_net(sk),
+ 					 LINUX_MIB_TCPPREQUEUEDROPPED);
  		}
- 		return 1;
+ 
+ 		tp->ucopy.memory = 0;
+ 	} else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
+ 		wake_up_interruptible_poll(sk->sk_sleep,
+ 					   POLLIN | POLLRDNORM | POLLRDBAND);
+ 		if (!inet_csk_ack_scheduled(sk))
+ 			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
 -						  (3 * TCP_RTO_MIN) / 4,
++					          (3 * tcp_rto_min(sk)) / 4,
+ 						  TCP_RTO_MAX);
  	}
- 	return 0;
+ 	return 1;
  }
  
  

Re: linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

On Tue, 21 Apr 2009 01:33:23 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Herbert Xu <herbert@gondor.apana.org.au>
> Date: Tue, 21 Apr 2009 09:22:16 +0800
> 
> > I think that's the right one.
> 
> I'm taking care of this merge conflict right now, thanks.

Thanks to you both.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the net tree with the tree

[David Miller]

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 21 Apr 2009 09:22:16 +0800

> On Tue, Apr 21, 2009 at 11:06:12AM +1000, Stephen Rothwell wrote:
>> Hi David,
>> 
>> Today's linux-next merge of the net tree got a conflict in net/core/dev.c
>> between commit 5db8765a86a4cbaf45adaf8c231cf9a6ca2dcfaf ("net: Fix GRO
>> for multiple page fragments") from the net-current tree and commit
>> 76620aafd66f0004829764940c5466144969cffc ("gro: New frags interface to
>> avoid copying shinfo") from the net tree.
>> 
>> I used the version from the net tree.
> 
> I think that's the right one.

I'm taking care of this merge conflict right now, thanks.

Re: linux-next: manual merge of the net tree with the tree

[Herbert Xu]

On Tue, Apr 21, 2009 at 11:06:12AM +1000, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the net tree got a conflict in net/core/dev.c
> between commit 5db8765a86a4cbaf45adaf8c231cf9a6ca2dcfaf ("net: Fix GRO
> for multiple page fragments") from the net-current tree and commit
> 76620aafd66f0004829764940c5466144969cffc ("gro: New frags interface to
> avoid copying shinfo") from the net tree.
> 
> I used the version from the net tree.

I think that's the right one.

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in net/core/dev.c
between commit 5db8765a86a4cbaf45adaf8c231cf9a6ca2dcfaf ("net: Fix GRO
for multiple page fragments") from the net-current tree and commit
76620aafd66f0004829764940c5466144969cffc ("gro: New frags interface to
avoid copying shinfo") from the net tree.

I used the version from the net tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/rt2x00/rt73usb.c between commit
98a2103b0e9725ce5b3dcecd8dfcae977e6938ed ("rt2x00 : more devices to
rt73usb.c") from the wireless-current tree and various commits from the
net tree.

I used the version of the file from the wireless tree merge-test branch
(thanks John).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
c4e061ace75513aee227090486cc46dec7810c00 ("iwlwifi: save PCI state before
suspend, restore after resume") from the wireless-current tree and commit
2663516d8fb896430bf42dce41b3e2f141d63bd5 ("iwl3945: report killswitch
changes even if the interface is down") from the net and wireless trees.

Again, the former is just a subset of the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the net tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn.c between commit
c4e061ace75513aee227090486cc46dec7810c00 ("iwlwifi: save PCI state before
suspend, restore after resume") from the wireless-current tree and
commit 6cd0b1cb872b3bf9fc5de4536404206ab74bafdd ("iwlagn: fix hw-rfkill
while the interface is down") from the net and wireless trees.

The former just appears to be a subset of the latter.  I fixed it up and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]