Merge bluetooth branch into master

Main changes:

 - Move net/bluetooth/ to subsys/bluetooth/host/
 - Move drivers/bluetooth/controller to subsys/bluetooth/controller
 - Fix re-encryption procedure in controller
 - Fixes & cleanups to L2CAP Connection oriented Channels
 - Improved RFCOMM support

----------------------------------------------------------------
Jaganath Kanakkassery (6):
      Bluetooth: RFCOMM: Remove extra tab
      Bluetooth: RFCOMM: Define enum and macros for role and CR
      Bluetooth: RFCOMM: Introduce helper to get session
      Bluetooth: RFCOMM: Introduce helper to initialize dlc
      Bluetooth: RFCOMM: Set sec_level to LOW during L2CAP register
      Bluetooth: RFCOMM: Define macro for PF bit

Johan Hedberg (4):
      Bluetooth: Move Bluetooth host stack to subsys
      Bluetooth: Move controller code to subsys/bluetooth
      Bluetooth: Remove misleading NBLE mentions from sample README files
      Bluetooth: Print full controller info upon init

Luiz Augusto von Dentz (5):
      Bluetooth: L2CAP: Make CoC depend on SMP
      Bluetooth: L2CAP: Handle LE connection response security errors
      Bluetooth: L2CAP: Fix not updating CoC channel state
      Bluetooth: L2CAP: Log state transitions
      Bluetooth: L2CAP: Make use of bt_l2cap_chan_set_state on BR/EDR

Mariusz Skamra (7):
      Bluetooth: tester: Rename config files
      Bluetooth: tester: Add configuration file for Zephyr BLE firmware
      Bluetooth: tester: Set Zephyr-based BLE configuration as default
      Bluetooth: tester: Fix configuration file name
      Bluetooth: GATT: Pass data buffer as NULL if length is 0
      Bluetooth: tester: Increase number of available L2CAP channels
      Bluetooth: tester: Enable privacy for QEMU configuration

Sathish Narasimman (1):
      Bluetooth: Fix initialization of variable

Vinayak Chettimada (1):
      Bluetooth: Controller: Fix re-encryption procedure

 MAINTAINERS                          |   4 +-
 .../bluetooth/bluetooth.rst          |   2 +-
 drivers/bluetooth/Kconfig            |   2 -
 drivers/bluetooth/Makefile           |   1 -
 drivers/bluetooth/nble/Makefile      |   2 +-
 include/bluetooth/l2cap.h            |   4 +-
 include/bluetooth/rfcomm.h           |   9 +-
 net/Kconfig                          |   2 -
 net/Makefile                         |   1 -
 net/ip/Kconfig                       |   1 +
 samples/bluetooth/peripheral/README  |   4 -
 .../bluetooth/peripheral_esp/README  |   4 -
 .../bluetooth/peripheral_hr/README   |   4 -
 subsys/Kconfig                       |   1 +
 subsys/Makefile                      |   1 +
 subsys/bluetooth/Kconfig             |  20 +
 subsys/bluetooth/Makefile            |   2 +
 .../bluetooth/controller/Kconfig     |   0
 .../bluetooth/controller/Makefile    |   6 +-
 .../bluetooth/controller/hal/ccm.h   |   0
 .../bluetooth/controller/hal/cpu.h   |   0
 .../bluetooth/controller/hal/debug.h |   0
 .../bluetooth/controller/hal/ecb.c   |   0
 .../bluetooth/controller/hal/ecb.h   |   0
 .../controller/hal/hal_rtc.h         |   0
 .../controller/hal/hal_work.h        |   0
 .../bluetooth/controller/hal/radio.c |   0
 .../bluetooth/controller/hal/radio.h |   0
 .../bluetooth/controller/hal/rand.c  |   0
 .../bluetooth/controller/hal/rand.h  |   0
 .../bluetooth/controller/hal/rtc.c   |   0
 .../bluetooth/controller/hci/hci.c   |   0
 .../controller/hci/hci_driver.c      |   2 +-
 .../controller/hci/hci_internal.h    |   0
 .../bluetooth/controller/ll/ctrl.c   |   2 +-
 .../bluetooth/controller/ll/ctrl.h   |   0
 .../controller/ll/ctrl_internal.h    |   1 -
 .../bluetooth/controller/ll/ll.c     |   0
 .../bluetooth/controller/ll/ll.h     |   0
 .../bluetooth/controller/ll/pdu.h    |   0
 .../bluetooth/controller/ll/ticker.c |   0
 .../bluetooth/controller/ll/ticker.h |   0
 .../controller/util/defines.h        |   0
 .../bluetooth/controller/util/mem.c  |   0
 .../bluetooth/controller/util/mem.h  |   0
 .../bluetooth/controller/util/memq.c |   0
 .../bluetooth/controller/util/memq.h |   0
 .../bluetooth/controller/util/util.c |   0
 .../bluetooth/controller/util/util.h |   0
 .../bluetooth/controller/util/work.c |   0
 .../bluetooth/controller/util/work.h |   0
 .../bluetooth/host}/Kconfig          |   1 +
 .../bluetooth/host}/Makefile         |   0
 .../bluetooth/host}/a2dp.c           |   0
 .../bluetooth/host}/a2dp_internal.h  |   0
 .../bluetooth/host}/at.c             |   2 +
 .../bluetooth/host}/at.h             |   0
 .../bluetooth/host}/att.c            |   0
 .../bluetooth/host}/att_internal.h   |   0
 .../bluetooth/host}/avdtp.c          |   0
 .../bluetooth/host}/avdtp_internal.h |   0
 .../bluetooth/host}/conn.c           |   0
 .../bluetooth/host}/conn_internal.h  |   0
 .../bluetooth/host}/ecc.h            |   1 -
 .../bluetooth/host}/gatt.c           |  13 +-
 .../bluetooth/host}/gatt_internal.h  |   0
 .../bluetooth/host}/hci_core.c       |  39 +-
 .../bluetooth/host}/hci_core.h       |   2 +
 .../bluetooth/host}/hci_ecc.c        |   0
 .../bluetooth/host}/hci_ecc.h        |   0
 .../bluetooth/host}/hci_raw.c        |   0
 .../bluetooth/host}/hfp_hf.c         |   0
 .../bluetooth/host}/hfp_internal.h   |   0
 .../bluetooth/host}/keys.c           |   1 -
 .../bluetooth/host}/keys.h           |   0
 .../bluetooth/host}/keys_br.c        |   0
 .../bluetooth/host}/l2cap.c          | 265 +++++++++---
 .../bluetooth/host}/l2cap_br.c       | 108 +----
 .../bluetooth/host}/l2cap_internal.h |  12 +
 .../bluetooth/host}/log.c            |   0
 .../bluetooth/host}/monitor.c        |   0
 .../bluetooth/host}/monitor.h        |   0
 .../bluetooth/host}/rfcomm.c         |  98 +++--
 .../host}/rfcomm_internal.h          |  43 +-
 .../bluetooth/host}/sdp.c            |   0
 .../bluetooth/host}/sdp_internal.h   |   0
 .../bluetooth/host}/smp.c            |   0
 .../bluetooth/host}/smp.h            |   0
 .../bluetooth/host}/smp_null.c       |   0
 .../bluetooth/host}/uuid.c           |   0
 tests/bluetooth/shell/README         |   7 -
 tests/bluetooth/tester/Makefile      |   5 +-
 tests/bluetooth/tester/README        |  18 +-
 tests/bluetooth/tester/default.conf  |  15 +
 .../{prj_nble.conf => nble.conf}     |   0
 .../{prj_nimble.conf => nimble.conf} |   0
 .../tester/{prj.conf => qemu.conf}   |   1 +
 tests/bluetooth/tester/src/l2cap.c   |   2 +-
 tests/bluetooth/tester/testcase.ini  |   2 +-
 99 files changed, 455 insertions(+), 255 deletions(-)
 delete mode 100644 samples/bluetooth/peripheral/README
 delete mode 100644 samples/bluetooth/peripheral_esp/README
 delete mode 100644 samples/bluetooth/peripheral_hr/README
 create mode 100644 subsys/bluetooth/Kconfig
 create mode 100644 subsys/bluetooth/Makefile
 rename {drivers => subsys}/bluetooth/controller/Kconfig (100%)
 rename {drivers => subsys}/bluetooth/controller/Makefile (70%)
 rename {drivers => subsys}/bluetooth/controller/hal/ccm.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/cpu.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/debug.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/ecb.c (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/ecb.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/hal_rtc.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/hal_work.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/radio.c (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/radio.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/rand.c (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/rand.h (100%)
 rename {drivers => subsys}/bluetooth/controller/hal/rtc.c (100%)
 rename {drivers => subsys}/bluetooth/controller/hci/hci.c (100%)
 rename {drivers => subsys}/bluetooth/controller/hci/hci_driver.c (99%)
 rename {drivers => subsys}/bluetooth/controller/hci/hci_internal.h (100%)
 rename {drivers => subsys}/bluetooth/controller/ll/ctrl.c (99%)
 rename {drivers => subsys}/bluetooth/controller/ll/ctrl.h (100%)
 rename {drivers => subsys}/bluetooth/controller/ll/ctrl_internal.h (99%)
 rename {drivers => subsys}/bluetooth/controller/ll/ll.c (100%)
 rename {drivers => subsys}/bluetooth/controller/ll/ll.h (100%)
 rename {drivers => subsys}/bluetooth/controller/ll/pdu.h (100%)
 rename {drivers => subsys}/bluetooth/controller/ll/ticker.c (100%)
 rename {drivers => subsys}/bluetooth/controller/ll/ticker.h (100%)
 rename {drivers => subsys}/bluetooth/controller/util/defines.h (100%)
 rename {drivers => subsys}/bluetooth/controller/util/mem.c (100%)
 rename {drivers => subsys}/bluetooth/controller/util/mem.h (100%)
 rename {drivers => subsys}/bluetooth/controller/util/memq.c (100%)
 rename {drivers => subsys}/bluetooth/controller/util/memq.h (100%)
 rename {drivers => subsys}/bluetooth/controller/util/util.c (100%)
 rename {drivers => subsys}/bluetooth/controller/util/util.h (100%)
 rename {drivers => subsys}/bluetooth/controller/util/work.c (100%)
 rename {drivers => subsys}/bluetooth/controller/util/work.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/Kconfig (99%)
 rename {net/bluetooth => subsys/bluetooth/host}/Makefile (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/a2dp.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/a2dp_internal.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/at.c (99%)
 rename {net/bluetooth => subsys/bluetooth/host}/at.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/att.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/att_internal.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/avdtp.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/avdtp_internal.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/conn.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/conn_internal.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/ecc.h (99%)
 rename {net/bluetooth => subsys/bluetooth/host}/gatt.c (99%)
 rename {net/bluetooth => subsys/bluetooth/host}/gatt_internal.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/hci_core.c (99%)
 rename {net/bluetooth => subsys/bluetooth/host}/hci_core.h (98%)
 rename {net/bluetooth => subsys/bluetooth/host}/hci_ecc.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/hci_ecc.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/hci_raw.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/hfp_hf.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/hfp_internal.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/keys.c (99%)
 rename {net/bluetooth => subsys/bluetooth/host}/keys.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/keys_br.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/l2cap.c (89%)
 rename {net/bluetooth => subsys/bluetooth/host}/l2cap_br.c (94%)
 rename {net/bluetooth => subsys/bluetooth/host}/l2cap_internal.h (93%)
 rename {net/bluetooth => subsys/bluetooth/host}/log.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/monitor.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/monitor.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/rfcomm.c (93%)
 rename {net/bluetooth => subsys/bluetooth/host}/rfcomm_internal.h (73%)
 rename {net/bluetooth => subsys/bluetooth/host}/sdp.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/sdp_internal.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/smp.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/smp.h (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/smp_null.c (100%)
 rename {net/bluetooth => subsys/bluetooth/host}/uuid.c (100%)
 delete mode 100644 tests/bluetooth/shell/README
 create mode 100644 tests/bluetooth/tester/default.conf
 rename tests/bluetooth/tester/{prj_nble.conf => nble.conf} (100%)
 rename tests/bluetooth/tester/{prj_nimble.conf => nimble.conf} (100%)
 rename tests/bluetooth/tester/{prj.conf => qemu.conf} (95%)

Change-id: I27822b128f9dd739e2a7005b1385705800f8e35c
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>