Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/nvmem/core.c
Simple merge

diff --cc drivers/pwm/sysfs.c
Simple merge

diff --cc drivers/rtc/rtc-pcf8523.c
Simple merge

diff --cc drivers/staging/vc04_services/bcm2835-camera/controls.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/bluetooth/hci_conn.c
index 7516cdd,bd4978c..5ca75f9
--- 1/net/bluetooth/hci_conn.c
--- 2/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@@ -1272,23 -1272,10 +1272,15 @@@ int hci_conn_check_link_mode(struct hci
                        return 0;
        }
  
 -      if (hci_conn_ssp_enabled(conn) &&
 -          !test_bit(HCI_CONN_ENCRYPT, &conn->flags))
 +      /* If Secure Simple Pairing is not enabled, then legacy connection
 +       * setup is used and no encryption or key sizes can be enforced.
 +       */
 +      if (!hci_conn_ssp_enabled(conn))
 +              return 1;
 +
 +      if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
                return 0;
  
-       /* The minimum encryption key size needs to be enforced by the
-        * host stack before establishing any L2CAP connections. The
-        * specification in theory allows a minimum of 1, but to align
-        * BR/EDR and LE transports, a minimum of 7 is chosen.
-        */
-       if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE)
-               return 0;
- 
        return 1;
  }
  

diff --cc sound/soc/codecs/cs42xx8.c
Simple merge