linux-next: manual merge of the bluetooth tree with Linus' tree

linux-next: manual merge of the bluetooth tree with Linus' tree

[Stephen Rothwell]

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

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/l2cap_sock.c between commit 6230c9b4f895 ("bluetooth:
Properly clone LSM attributes to newly created child connections") from
Linus' tree and commit 15770b1ab974 ("Bluetooth: convert force_active
variable to flag in l2cap chan") from the bluetooth tree.

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

diff --cc net/bluetooth/l2cap_sock.c
index e829236,836d12e..0000000
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@@ -931,12 -944,7 +946,9 @@@ static void l2cap_sock_init(struct soc
  		chan->max_tx = pchan->max_tx;
  		chan->tx_win = pchan->tx_win;
  		chan->sec_level = pchan->sec_level;
- 		chan->role_switch = pchan->role_switch;
- 		chan->force_reliable = pchan->force_reliable;
- 		chan->flushable = pchan->flushable;
- 		chan->force_active = pchan->force_active;
+ 		chan->flags = pchan->flags;
 +
 +		security_sk_clone(parent, sk);
  	} else {
  
  		switch (sk->sk_type) {

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

linux-next: manual merge of the bluetooth tree with Linus' tree

[Stephen Rothwell]

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

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/rfcomm/core.c between commit 25cc4ae913a4 ("net: remove
redundant check for timer pending state before del_timer") from Linus' tree
and commit 5c87e6efd14d ("Bluetooth: Avoid rfcomm_session_timeout using
freed session") from the bluetooth tree.

I fixed it up (I just used the bluetooth tree version) and can carry the
fix as necessary (no action is required).

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

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