Merge remote-tracking branch 'bluetooth/master'

diff --cc net/bluetooth/hci_conn.c
index 3c094e78dde98cafed3ac893abd3b2fa86b76a92,59f0344406c81762cc27fdeadfb6d318b417f8bc..b9196a44f7598bf33b0c2bff6d0764eeeba8fc11
--- 1/net/bluetooth/hci_conn.c
--- 2/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@@ -29,9 -29,8 +29,9 @@@
  #include <net/bluetooth/bluetooth.h>
  #include <net/bluetooth/hci_core.h>
  #include <net/bluetooth/a2mp.h>
 +#include <net/bluetooth/smp.h>
  
- static void hci_le_connect(struct hci_conn *conn)
+ static void hci_le_create_connection(struct hci_conn *conn)
  {
        struct hci_dev *hdev = conn->hdev;
        struct hci_cp_le_create_conn cp;

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

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