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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  net/core/sock.c

between commit:

  8265792bf887 ("net: silence KCSAN warnings around sk_add_backlog() calls")

from the net tree and commit:

  5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/core/sock.c
index 54c06559ad8f,50b930364cb0..000000000000
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@@ -521,8 -521,8 +521,8 @@@ int __sk_receive_skb(struct sock *sk, s
  
  		rc = sk_backlog_rcv(sk, skb);
  
- 		mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
+ 		mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
 -	} else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
 +	} else if (sk_add_backlog(sk, skb, READ_ONCE(sk->sk_rcvbuf))) {
  		bh_unlock_sock(sk);
  		atomic_inc(&sk->sk_drops);
  		goto discard_and_relse;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in net/core/dev.c
between commit 05532121da0728eaedac2a0a5c3cecad3a95d765 ("net: 802.1q:
make vlan_hwaccel_do_receive() return void") from the net tree and commit
cf66ba58b5cb8b1526e9dd2fb96ff8db048d4d44 ("netdev: Add tracepoints to
netdev layer") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/core/dev.c
index fc2dc93,2308cce..0000000
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2847,8 -2835,9 +2854,9 @@@ static int __netif_receive_skb(struct s
  	if (!netdev_tstamp_prequeue)
  		net_timestamp_check(skb);
  
+ 	trace_netif_receive_skb(skb);
 -	if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb))
 -		return NET_RX_SUCCESS;
 +	if (vlan_tx_tag_present(skb))
 +		vlan_hwaccel_do_receive(skb);
  
  	/* if we've gotten here through NAPI, check netpoll */
  	if (netpoll_receive_skb(skb))

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

[Stephen Rothwell]

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

Hi Paul,

On Mon, 21 Jun 2010 10:30:11 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> I defer to Jiri on this one, and will withdraw my patch.

OK, thanks.

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

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

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

[Paul E. McKenney]

On Mon, Jun 21, 2010 at 04:16:09PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> net/bridge/br_fdb.c net/bridge/netfilter/ebt_redirect.c
> net/bridge/netfilter/ebt_ulog.c net/bridge/netfilter/ebtables.c
> net/netfilter/nfnetlink_log.c between commit
> f350a0a87374418635689471606454abc7beaa3a ("bridge: use rx_handler_data
> pointer to store net_bridge_port pointer") from the net tree and commit
> 81bdf5bd7349bd4523538cbd7878f334bc2bfe14 ("net: Make accesses to
> ->br_port safe for sparse RCU") from the tip tree.
> 
> The net tree commit looks like a superset of the tip tree commit, so I
> effectively reverted the tip tree commit.

I defer to Jiri on this one, and will withdraw my patch.

							Thanx, Paul

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
net/bridge/br_fdb.c net/bridge/netfilter/ebt_redirect.c
net/bridge/netfilter/ebt_ulog.c net/bridge/netfilter/ebtables.c
net/netfilter/nfnetlink_log.c between commit
f350a0a87374418635689471606454abc7beaa3a ("bridge: use rx_handler_data
pointer to store net_bridge_port pointer") from the net tree and commit
81bdf5bd7349bd4523538cbd7878f334bc2bfe14 ("net: Make accesses to
->br_port safe for sparse RCU") from the tip tree.

The net tree commit looks like a superset of the tip tree commit, so I
effectively reverted the tip tree commit.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

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

Hi Dave,

On Wed, 12 Aug 2009 17:33:25 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 7 Aug 2009 16:47:05 +1000
> 
> > Today's linux-next merge of the tip tree got a conflict in
> > arch/x86/include/asm/socket.h between commits
> > 49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL
> > getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net:
> > implement a SO_DOMAIN getsockoption") from the net tree and commit
> > 73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate
> > header files") from the tip tree.
> > 
> > The latter change supercedes the former ones, so I used the latter.
> 
> That should be the correct merge resolution, thanks!

OK, thanks for the confirmation.

-- 
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 tip tree with the net tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Aug 2009 16:47:05 +1000

> Today's linux-next merge of the tip tree got a conflict in
> arch/x86/include/asm/socket.h between commits
> 49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL
> getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net:
> implement a SO_DOMAIN getsockoption") from the net tree and commit
> 73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate
> header files") from the tip tree.
> 
> The latter change supercedes the former ones, so I used the latter.

That should be the correct merge resolution, thanks!

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/include/asm/socket.h between commits
49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL
getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net:
implement a SO_DOMAIN getsockoption") from the net tree and commit
73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate
header files") from the tip tree.

The latter change supercedes the former ones, so 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: 197 bytes --]