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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Eric Dumazet <edumazet@google.com>,
	Neal Cardwell <ncardwell@google.com>,
	Yuchung Cheng <ycheng@google.com>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Mon, 5 May 2014 14:29:34 +1000	[thread overview]
Message-ID: <20140505142934.4d732ab3e809850b426fce3d@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
net/ipv4/tcp_output.c between commit e114a710aa50 ("tcp: fix cwnd limited
checking to improve congestion control") from the  tree and commit
4e857c58efeb ("arch: Mass conversion of smp_mb__*()") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/tcp_output.c
index 694711a140d4,366cf06587b8..000000000000

--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@@ -1946,18 -1930,10 +1946,16 @@@ static bool tcp_write_xmit(struct sock 
  			/* It is possible TX completion already happened
  			 * before we set TSQ_THROTTLED, so we must
  			 * test again the condition.
- 			 * We abuse smp_mb__after_clear_bit() because
- 			 * there is no smp_mb__after_set_bit() yet
  			 */
- 			smp_mb__after_clear_bit();
+ 			smp_mb__after_atomic();
 -			if (atomic_read(&sk->sk_wmem_alloc) > limit)
 +			if (atomic_read(&sk->sk_wmem_alloc) > limit) {
 +				u32 unsent_bytes;
 +
 +compute_unsent_segs:
 +				unsent_bytes = tp->write_seq - tp->snd_nxt;
 +				unsent_segs = DIV_ROUND_UP(unsent_bytes, mss_now);
  				break;
 +			}
  		}
  
  		limit = mss_now;

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