Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

diff --cc net/bluetooth/af_bluetooth.c
index ba033f09196ee45d7d6fbd170386a0d62af1d4ac,a9ad589f3e72eb113ef1b896e7001773036d60ab..5355df63d39b673d246d131564a1e17dc116c27d
--- 1/net/bluetooth/af_bluetooth.c
--- 2/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@@ -591,10 -589,10 +589,10 @@@ static int bt_seq_show(struct seq_file 
                           atomic_read(&sk->sk_refcnt),
                           sk_rmem_alloc_get(sk),
                           sk_wmem_alloc_get(sk),
 -                         sock_i_uid(sk),
 +                         from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
                           sock_i_ino(sk),
-                          &src_baswapped,
-                          &dst_baswapped,
+                          &bt->src,
+                          &bt->dst,
                           bt->parent? sock_i_ino(bt->parent): 0LU);
  
                if (l->custom_seq_show) {

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge

diff --cc net/bluetooth/rfcomm/tty.c
Simple merge